teach ci macos tests to work transparently on arm64

BlueBrain · Apr 29, 2024 · d4c95e8 · d4c95e8
1 parent 849f4e2
commit d4c95e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -97,8 +97,6 @@ jobs:
     name: Run tests on macos
     runs-on: macos-latest
     env:
-      CIBW_ARCHS_MACOS: "x86_64"
-      CMAKE_OSX_ARCHITECTURES: "x86_64"
       UNIXY_HDF5_VERSION: 1.14.3
 
     steps:
@@ -125,13 +123,15 @@ jobs:
 
       - name: Build and run unittests C++ tests
         run: |
+            : "${CIBW_ARCHS_MACOS:=$(uname -m)}"
             export CMAKE_PREFIX_PATH=/Users/runner/work/src-cache/install-$CIBW_ARCHS_MACOS/install
             export STATIC_HDF5=True
 
             ./ci/cpp_test.sh
 
       - name: Build and run unittests python tests
         run: |
+            : "${CIBW_ARCHS_MACOS:=$(uname -m)}"
             export CMAKE_PREFIX_PATH=/Users/runner/work/src-cache/install-$CIBW_ARCHS_MACOS/install
             export STATIC_HDF5=True
 

diff --git a/ci/hdf5-build.sh b/ci/hdf5-build.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 set -e -x
 
+: "${UNIXY_HDF5_VERSION:=1.14.3}"
+: "${CIBW_ARCHS_MACOS:=$(uname -m)}"
 
 export INPUT=$(cd $(dirname "$1") && pwd -P)/$(basename "$1")
 export OUTPUT="$INPUT/install-$CIBW_ARCHS_MACOS"
 
-: "${UNIXY_HDF5_VERSION:=1.14.3}"
 
 function download_unpack_hdf5 {
     pushd "$INPUT"