diff --git a/.github/workflows/dependencies/dependencies_mac.sh b/.github/workflows/dependencies/dependencies_mac.sh index dc1aec64..ef4c617d 100755 --- a/.github/workflows/dependencies/dependencies_mac.sh +++ b/.github/workflows/dependencies/dependencies_mac.sh @@ -8,11 +8,8 @@ set -eu -o pipefail brew update -brew install gfortran || true +brew install gcc@15 || true brew install libomp || true -brew install open-mpi || true +brew install --cc=gcc-15 open-mpi --build-from-source || true brew install ccache || true -# verify installation -gfortran-14 --version -otool -L $(which gfortran-14) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c1a9839f..534c64bd 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,7 +8,7 @@ env: jobs: # Build all tutorials tests-macos: - name: AppleClang@15.0 GFortran@14.1 [tutorials] + name: AppleClang@15.0 GFortran@15.1 [tutorials] runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -28,7 +28,7 @@ jobs: -DAMReX_FORTRAN_INTERFACES=ON \ -DAMReX_EB=ON \ -DAMReX_PARTICLES=ON \ - -DCMAKE_Fortran_COMPILER=$(which gfortran-14) \ + -DCMAKE_Fortran_COMPILER=$(which gfortran-15) \ -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) cmake --build build --parallel 2 @@ -40,7 +40,7 @@ jobs: -DAMReX_FORTRAN_INTERFACES=ON \ -DAMReX_EB=ON \ -DAMReX_PARTICLES=ON \ - -DCMAKE_Fortran_COMPILER=$(which gfortran-14) \ + -DCMAKE_Fortran_COMPILER=$(which gfortran-15) \ -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) cmake --build build --parallel 2