From c4f4d5b8b95b3f5f25c70014bd6fcaeadaf71d51 Mon Sep 17 00:00:00 2001 From: Lourens Veen Date: Thu, 1 Aug 2024 15:10:01 +0200 Subject: [PATCH] Fix macOS 14 CI --- .github/workflows/ci_macos14_clang.yaml | 7 ++++--- .github/workflows/ci_macos14_gcc_gfortran.yaml | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_macos14_clang.yaml b/.github/workflows/ci_macos14_clang.yaml index c55ba322..42858916 100644 --- a/.github/workflows/ci_macos14_clang.yaml +++ b/.github/workflows/ci_macos14_clang.yaml @@ -26,9 +26,10 @@ jobs: run: | HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config - python3 -m pip install --upgrade pip - pip3 install tox tox-gh-actions + python3 -m venv ~/tox_venv + . ~/tox_venv/bin/activate && python3 -m pip install --upgrade pip + . ~/tox_venv/bin/activate && python3 -m pip install tox tox-gh-actions - name: Run all tests on macOS Sonoma 14 with Clang - run: cd ${GITHUB_WORKSPACE} && make test test_examples + run: cd ${GITHUB_WORKSPACE} && PATH=$PATH:~/tox_venv/bin make test test_examples diff --git a/.github/workflows/ci_macos14_gcc_gfortran.yaml b/.github/workflows/ci_macos14_gcc_gfortran.yaml index d1aab066..8a586f88 100644 --- a/.github/workflows/ci_macos14_gcc_gfortran.yaml +++ b/.github/workflows/ci_macos14_gcc_gfortran.yaml @@ -19,16 +19,17 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: latest + xcode-version: 15.3 - name: Install dependencies run: | - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc + HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc@14 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config - python3 -m pip install --upgrade pip - pip3 install tox tox-gh-actions + python3 -m venv ~/tox_venv + . ~/tox_venv/bin/activate && python3 -m pip install --upgrade pip + . ~/tox_venv/bin/activate && pip3 install tox tox-gh-actions - name: Run all tests - run: cd ${GITHUB_WORKSPACE} && CXX=g++-12 OMPI_CXX=g++-12 FC=gfortran-12 OMPI_FC=gfortran-12 make test test_examples + run: cd ${GITHUB_WORKSPACE} && PATH=$PATH:~/tox_venv/bin CXX=g++-14 OMPI_CXX=g++-14 FC=gfortran-14 OMPI_FC=gfortran-14 make test test_examples