Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run tests for macos-14 on arm64 #1027

Merged
merged 3 commits into from
Mar 25, 2024
Merged

Run tests for macos-14 on arm64 #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73787b1
Run tests for macos-14 on arm64
nak3 Mar 21, 2024
51e6f0e
Split the jobs into two files, macOS and macOS-legacy.
nak3 Mar 22, 2024
adc4d43
Revert "Split the jobs into two files, macOS and macOS-legacy."
nak3 Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/macos.yml
View file
Open in desktop
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
View file
Open in desktop
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