From 689f62ea679cd0d6a207c3009f0decaf4e9281e3 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 1 Oct 2024 17:20:14 +0000 Subject: [PATCH 1/7] Linux.yml: test with multiple gcc versions --- .github/workflows/Linux.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 76a8ff7..c3d603a 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -15,9 +15,9 @@ on: jobs: Linux: runs-on: ubuntu-latest - env: - FC: gfortran-11 - CC: gcc-11 + strategy: + matrix: + gcc-version: [12,14] steps: @@ -26,6 +26,7 @@ jobs: - name: build run: | + export CC=gcc-${{ matrix.gcc-version }} ; export FC=gfortran-${{ matrix.gcc-version }} cmake -B build cmake --build build --parallel 2 --verbose @@ -33,5 +34,3 @@ jobs: run: | set -e ctest --test-dir build --output-on-failure --rerun-failed --verbose - - From 105d6c5a6e56434f61c4eee24b85111494192859 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 1 Oct 2024 17:25:40 +0000 Subject: [PATCH 2/7] debug --- .github/workflows/Linux.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index c3d603a..cadf0a1 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -21,6 +21,12 @@ jobs: steps: + - name: get-gcc + run: | + if [ -z $(type -P gcc-${{ matrix.gcc-version }}) ]; then + sudo apt install gcc-${{ gcc-version }} + fi + - name: checkout uses: actions/checkout@v4 From ab8691ab1a38245a5ec2757ad8a3612dff13afe9 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 1 Oct 2024 17:26:37 +0000 Subject: [PATCH 3/7] debug --- .github/workflows/Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index cadf0a1..a027df8 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -24,7 +24,7 @@ jobs: - name: get-gcc run: | if [ -z $(type -P gcc-${{ matrix.gcc-version }}) ]; then - sudo apt install gcc-${{ gcc-version }} + sudo apt install gcc-${{ matrix.gcc-version }} fi - name: checkout From 52c4ccf452dbf7349778c18afdf905ba57beeb20 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 1 Oct 2024 17:27:59 +0000 Subject: [PATCH 4/7] Linux.yml: use 24.04 --- .github/workflows/Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index a027df8..7dd8bcb 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -14,7 +14,7 @@ on: jobs: Linux: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: matrix: gcc-version: [12,14] From b7e8c148e39088e5f1df676a7746dbd7256f9f3d Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 1 Oct 2024 17:29:38 +0000 Subject: [PATCH 5/7] MacOS.yml: move to gcc-12 --- .github/workflows/MacOS.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index f7ea4ae..043a42e 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -16,8 +16,8 @@ jobs: MacOS: runs-on: macos-latest env: - FC: gfortran-11 - CC: gcc-11 + FC: gfortran-12 + CC: gcc-12 strategy: matrix: shared: [ON, OFF] From 213de672f5aed9d985c2ff8ac3d5ca81cd6885c5 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 1 Oct 2024 17:35:02 +0000 Subject: [PATCH 6/7] test gcc 11 & 14 --- .github/workflows/Linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 7dd8bcb..42e67d4 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -17,14 +17,14 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - gcc-version: [12,14] + gcc-version: [11,14] steps: - name: get-gcc run: | if [ -z $(type -P gcc-${{ matrix.gcc-version }}) ]; then - sudo apt install gcc-${{ matrix.gcc-version }} + sudo apt install gcc-${{ matrix.gcc-version }} gfortran=${{ matrix.gcc-version }} fi - name: checkout From 132a58df4d052155289a808dad156bd4da23bd48 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 1 Oct 2024 17:36:21 +0000 Subject: [PATCH 7/7] Revert "test gcc 11 & 14" This reverts commit 213de672f5aed9d985c2ff8ac3d5ca81cd6885c5. --- .github/workflows/Linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 42e67d4..7dd8bcb 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -17,14 +17,14 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - gcc-version: [11,14] + gcc-version: [12,14] steps: - name: get-gcc run: | if [ -z $(type -P gcc-${{ matrix.gcc-version }}) ]; then - sudo apt install gcc-${{ matrix.gcc-version }} gfortran=${{ matrix.gcc-version }} + sudo apt install gcc-${{ matrix.gcc-version }} fi - name: checkout