From c828f57516c92addfa65dc01ac000378b51c2502 Mon Sep 17 00:00:00 2001 From: Luke Shingles Date: Wed, 15 May 2024 13:59:12 +0200 Subject: [PATCH] Use gcc-14 for CI checks --- .github/workflows/ci-checks.yml | 12 ++++++------ .github/workflows/ci.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 5bc478088..5a29ce74a 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -97,18 +97,17 @@ jobs: run-clang-tidy compile: - runs-on: ubuntu-24.04 env: CXX: g++ strategy: matrix: compiler: [ - {name: gcc, ver: 11}, - {name: gcc, ver: 12}, - {name: gcc, ver: 13}, - {name: gcc, ver: 14}, - {name: nvc++, ver: '24.3'}, + {os: ubuntu-24.04, name: gcc, ver: 11}, + {os: ubuntu-24.04, name: gcc, ver: 12}, + {os: ubuntu-24.04, name: gcc, ver: 13}, + {os: ubuntu-24.04, name: gcc, ver: 14}, + {os: ubuntu-22.04, name: nvc++, ver: '24.3'}, ] mpi: [ON, OFF] openmp: [ON, OFF] @@ -118,6 +117,7 @@ jobs: stdpar: ON fail-fast: false + runs-on: ${{ matrix.compiler.os }} name: ${{ matrix.compiler.name }} ${{ matrix.compiler.ver }}${{ matrix.mpi == 'ON' && ' MPI' || ''}}${{ matrix.openmp == 'ON' && ' OpenMP' || ''}}${{ matrix.stdpar == 'ON' && ' stdpar' || ''}} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08fb507a9..32475af9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,12 +53,12 @@ jobs: # sudo add-apt-repository multiverse sudo apt-get update - - name: Install gcc-13 + - name: Install gcc-14 if: always() uses: fortran-lang/setup-fortran@v1 with: compiler: gcc - version: 13 + version: 14 - name: install gsl and openmpi run: |