Merge pull request #460 from mmuetzel/ci-macos

CI: Install numpy from Homebrew on macOS
opencollab · Jun 22, 2024 · 1ebaf74 · 1ebaf74
2 parents 9d9e1bf + e5643dc
commit 1ebaf74
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/.github/workflows/jobs.yml b/.github/workflows/jobs.yml
@@ -187,7 +187,7 @@ jobs:
           export CFLAGS="-Qunused-arguments"
           export CXX=mpic++ # Uses clang++.
           export CXXFLAGS="-Qunused-arguments"
-          LIBS="-framework Accelerate" cmake -DBLA_VENDOR=Generic -DEXAMPLES=ON -DICB=ON -DMPI=ON ..
+          cmake -DBLA_VENDOR=Apple -DEXAMPLES=ON -DICB=ON -DMPI=ON ..
           make all
           CTEST_OUTPUT_ON_FAILURE=1 make test
   macos_latest_cmake_python:
@@ -213,13 +213,9 @@ jobs:
           # https://github.com/actions/runner-images/issues/2322
           brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
           brew reinstall gcc # brings gfortran on path
-          brew install cmake eigen boost-python3 python3 
-          python3 -m venv ./venv
-          source ./venv/bin/activate
-          pip3 install numpy
+          brew install cmake eigen boost-python3 python3 numpy
       - name: Run job
         run: |
-          source ./venv/bin/activate
           mkdir -p build
           cd build
           export FC=gfortran
@@ -228,7 +224,7 @@ jobs:
           export CFLAGS="-Qunused-arguments"
           export CXX=clang++
           export CXXFLAGS="-Qunused-arguments"
-          LIBS="-framework Accelerate" cmake -DBLA_VENDOR=Generic -DEXAMPLES=ON -DICB=ON -DPYTHON3=ON ..
+          cmake -DBLA_VENDOR=Apple -DEXAMPLES=ON -DICB=ON -DPYTHON3=ON ..
           make all
           CTEST_OUTPUT_ON_FAILURE=1 make test
   macos_latest_autotools: