Skip to content

Commit e1ff841

Browse files
committed
CI: macOS w/ AppleClang
Change macOS CI to use the native system compiler, AppleClang, for C/C++ and only gfortran for the Fortran part. Try to unbreak macOS CI failures.
1 parent 2595b37 commit e1ff841

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/dependencies/dependencies_mac.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88
set -eu -o pipefail
99

1010
brew update
11-
brew reinstall gcc || true
11+
brew install gfortran || true
1212
brew install libomp || true
1313
brew install open-mpi || true
1414
brew install ccache || true
15+
16+
# verify installation
17+
gfortran --version
18+
otool -L $(which gfortran)
19+
20+
ls /opt/homebrew/opt/gcc/lib/gcc/current/

.github/workflows/macos.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@ name: macos
33
on: [push, pull_request]
44

55
env:
6-
CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -fno-operator-names"
6+
CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -fno-operator-names -Wno-pass-failed"
77

88
jobs:
99
# Build all tutorials
1010
tests-macos:
11-
name: AppleClang@14.0 GFortran@12.2 [tutorials]
11+
name: AppleClang@15.0 GFortran@14.1 [tutorials]
1212
runs-on: macos-latest
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Dependencies
1616
run: .github/workflows/dependencies/dependencies_mac.sh
1717
- name: Build & Install
1818
run: |
19-
export LIBRARY_PATH=/usr/local/opt/gcc/lib/gcc/current
20-
2119
cd ExampleCodes
2220
cmake -S . -B build \
2321
-DBUILD_SHARED_LIBS=ON \
@@ -28,8 +26,6 @@ jobs:
2826
-DAMReX_FORTRAN_INTERFACES=ON \
2927
-DAMReX_EB=ON \
3028
-DAMReX_PARTICLES=ON \
31-
-DCMAKE_C_COMPILER=$(which gcc) \
32-
-DCMAKE_CXX_COMPILER=$(which g++) \
3329
-DCMAKE_Fortran_COMPILER=$(which gfortran) \
3430
-DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)
3531
cmake --build build --parallel 2
@@ -42,8 +38,6 @@ jobs:
4238
-DAMReX_FORTRAN_INTERFACES=ON \
4339
-DAMReX_EB=ON \
4440
-DAMReX_PARTICLES=ON \
45-
-DCMAKE_C_COMPILER=$(which gcc) \
46-
-DCMAKE_CXX_COMPILER=$(which g++) \
4741
-DCMAKE_Fortran_COMPILER=$(which gfortran) \
4842
-DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)
4943
cmake --build build --parallel 2

0 commit comments

Comments
 (0)