From 87ffaf9e173250481ddbbf2c81fb2118d6547916 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 16:16:24 +0200 Subject: [PATCH 1/2] Use gcc-14 on MacOS following removal of gcc-11 --- .github/workflows/cmake.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 71c592e2dd..087ed262d4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -75,12 +75,12 @@ jobs: - name: Install ninja-build tool uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3 - - name: Use GCC-11 on MacOS + - name: Use GCC-14 on MacOS if: ${{ matrix.os == 'macos-latest' }} run: > cmake -B build -G Ninja - -D CMAKE_C_COMPILER="gcc-11" - -D CMAKE_Fortran_COMPILER="gfortran-11" + -D CMAKE_C_COMPILER="gcc-14" + -D CMAKE_Fortran_COMPILER="gfortran-14" -D USE_FLAT_NAMESPACE:BOOL=ON - name: Special flags for Windows @@ -237,4 +237,4 @@ jobs: fi done exit 0 - fi \ No newline at end of file + fi From 43add02e4f5b2ed711495be367b43043d8a6eb73 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 20 Aug 2024 16:18:12 +0200 Subject: [PATCH 2/2] Update to gcc-14 on MacOS following removal of gcc-11 --- .github/workflows/makefile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 81a39302af..eb6720dbaa 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -90,8 +90,8 @@ jobs: echo "DOCSDIR = ${{github.workspace}}/DOCS" >> make.inc - name: Alias for GCC compilers run: | - sudo ln -s $(which gcc-11) /usr/local/bin/gcc - sudo ln -s $(which gfortran-11) /usr/local/bin/gfortran + sudo ln -s $(which gcc-14) /usr/local/bin/gcc + sudo ln -s $(which gfortran-14) /usr/local/bin/gfortran - name: Install run: | make -s -j2 all