Skip to content

Commit f15393a

Browse files
committed
ci: Build and run on macOS on both x86_64 and arm64
The "macos-latest" runners are arm64 these days, while "macos-13" is older runners that are x86_64. Keep running tests on both, for as long as the x86_64 based runners are available.
1 parent 272e3ef commit f15393a

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@ jobs:
7878
- run: meson test -C builddir -v
7979

8080
macos:
81-
runs-on: macos-latest
81+
strategy:
82+
fail-fast: false
83+
matrix:
84+
runner:
85+
- macos-13 # x86_64
86+
- macos-latest # aarch64
87+
runs-on: ${{matrix.runner}}
8288
steps:
8389
- uses: actions/checkout@v3
8490
- run: brew install nasm meson
@@ -105,15 +111,6 @@ jobs:
105111
- run: CFLAGS=-Werror make -j$(nproc) ARCH=aarch64 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
106112
- run: qemu-aarch64 -L /usr/aarch64-linux-gnu/ ./codec_unittest
107113

108-
macos-cross-arm64:
109-
runs-on: macos-latest
110-
steps:
111-
- uses: actions/checkout@v3
112-
- run: make gmp-bootstrap
113-
- run: make gtest-bootstrap
114-
- run: c++ --version
115-
- run: CFLAGS=-Werror make -j$(sysctl -n hw.ncpu) ARCH=arm64
116-
117114
ios-cross-arm64:
118115
runs-on: macos-latest
119116
steps:

0 commit comments

Comments
 (0)