diff options
author | Theo Buehler <tb@openbsd.org> | 2024-03-25 18:35:45 +1100 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2024-03-25 18:35:45 +1100 |
commit | 577970ab842f7e352048d45fe930ddd21f4190f3 (patch) | |
tree | e75f01186eeaa483f8cde0490e4125d5c78cbfe5 | |
parent | d481bacadbe99d4b551600fe6ece20667638b4c6 (diff) | |
parent | adc4d4332cb33a8630b9c6aa2d58c14a6b45c86d (diff) | |
download | portable-577970ab842f7e352048d45fe930ddd21f4190f3.tar.gz portable-577970ab842f7e352048d45fe930ddd21f4190f3.tar.bz2 portable-577970ab842f7e352048d45fe930ddd21f4190f3.zip |
Land #1027 - run macos tests on arm64
-rw-r--r-- | .github/workflows/macos.yml | 1 | ||||
-rwxr-xr-x | scripts/test | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f570f19..cd52d2c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml | |||
@@ -34,3 +34,4 @@ jobs: | |||
34 | run: ./scripts/test | 34 | run: ./scripts/test |
35 | env: | 35 | env: |
36 | ARCH: "${{ matrix.arch }}" | 36 | ARCH: "${{ matrix.arch }}" |
37 | OS: "${{ matrix.os }}" | ||
diff --git a/scripts/test b/scripts/test index 97e316e..d093eab 100755 --- a/scripts/test +++ b/scripts/test | |||
@@ -34,7 +34,9 @@ if [ `uname` = "Darwin" ]; then | |||
34 | cd build-static | 34 | cd build-static |
35 | cmake -DCMAKE_OSX_ARCHITECTURES=$ARCH .. | 35 | cmake -DCMAKE_OSX_ARCHITECTURES=$ARCH .. |
36 | make -j 4 | 36 | make -j 4 |
37 | if [ "$ARCH" = "x86_64" ]; then | 37 | if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then |
38 | echo "##### skip tests" | ||
39 | else | ||
38 | make test | 40 | make test |
39 | fi | 41 | fi |
40 | ) | 42 | ) |
@@ -44,7 +46,9 @@ if [ `uname` = "Darwin" ]; then | |||
44 | cd build-shared | 46 | cd build-shared |
45 | cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCH .. | 47 | cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCH .. |
46 | make -j 4 | 48 | make -j 4 |
47 | if [ "$ARCH" = "x86_64" ]; then | 49 | if [ "$ARCH" = "arm64" ] && [ "$OS" = "macos-12" ] || [ "$OS" = "macos-13" ]; then |
50 | echo "##### skip tests" | ||
51 | else | ||
48 | make test | 52 | make test |
49 | fi | 53 | fi |
50 | ) | 54 | ) |