Skip to content

Commit 34186d8

Browse files
authored
Merge pull request #462 from awslabs/hughcars/update-macos-runners
Update clang to 18 and gcc to 15 inlight of update macos runners
2 parents de59a0f + 2966553 commit 34186d8

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

.github/workflows/build-and-test-macos.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,20 @@ jobs:
149149
CMAKE_BUILD_TYPE: Release
150150
NUM_PROC_BUILD_MAX: '32'
151151
run: |
152+
# We to install a separate version of CMake because the bundled one
153+
# has a bug with FindMPI that prevents it from finding MPI when
154+
# compiling with GNU compilers.
155+
brew install cmake
156+
152157
# Configure environment
153158
if [[ "${{ matrix.compiler }}" == 'clang' ]]; then
154-
export CC=$(brew --prefix llvm@15)/bin/clang
155-
export CXX=$(brew --prefix llvm@15)/bin/clang++
159+
export CC=$(brew --prefix llvm@18)/bin/clang
160+
export CXX=$(brew --prefix llvm@18)/bin/clang++
156161
export FC=gfortran-12
157162
elif [[ "${{ matrix.compiler }}" == 'gcc' ]]; then
158-
export CC=gcc-12
159-
export CXX=g++-12
160-
export FC=gfortran-12
163+
export CC=gcc-15
164+
export CXX=g++-15
165+
export FC=gfortran-15
161166
fi
162167
if [[ "${{ matrix.math-libs }}" == 'openblas' ]]; then
163168
export OPENBLAS_DIR=$(brew --prefix openblas)

0 commit comments

Comments
 (0)