Skip to content

Commit

Permalink
Land #1027 - run macos tests on arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
botovq committed Mar 25, 2024
2 parents d481bac + adc4d43 commit 577970a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ jobs:
run: ./scripts/test
env:
ARCH: "${{ matrix.arch }}"
OS: "${{ matrix.os }}"
8 changes: 6 additions & 2 deletions scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ if [ `uname` = "Darwin" ]; then
cd build-static
cmake -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
make -j 4
if [ "$ARCH" = "x86_64" ]; then
if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then
echo "##### skip tests"
else
make test
fi
)
Expand All @@ -44,7 +46,9 @@ if [ `uname` = "Darwin" ]; then
cd build-shared
cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCH ..
make -j 4
if [ "$ARCH" = "x86_64" ]; then
if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then
echo "##### skip tests"
else
make test
fi
)
Expand Down

0 comments on commit 577970a

Please sign in to comment.