From 3c088ae1fda1fe8d7c484b30d33df43c040f35ca Mon Sep 17 00:00:00 2001 From: GeorgeGayno-NOAA <52789452+GeorgeGayno-NOAA@users.noreply.github.com> Date: Tue, 17 Dec 2024 12:15:27 -0500 Subject: [PATCH] ubuntu_gcc CI fixes (#1007) Update the GCC CI workflow to run with GNU 13 and ubuntu 24.04. Fixes #1006. --- .github/workflows/ubuntu_gcc.yaml | 12 ++++++------ ci/spack.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu_gcc.yaml b/.github/workflows/ubuntu_gcc.yaml index 850434efe..2b48194b6 100644 --- a/.github/workflows/ubuntu_gcc.yaml +++ b/.github/workflows/ubuntu_gcc.yaml @@ -10,9 +10,9 @@ defaults: env: cache_key: gcc - CC: gcc-10 - FC: gfortran-10 - CXX: g++-10 + CC: gcc-13 + FC: gfortran-13 + CXX: g++-13 # The jobs are split into: # 1. a dependency build step (setup), and @@ -23,7 +23,7 @@ env: jobs: setup: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: checkout # this is to get the ci/spack.yaml file @@ -47,7 +47,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh - sed "s/\[oneapi, gcc@10:10, apple-clang@14\]/\[gcc@10:10\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml + sed "s/\[oneapi, gcc@13:13, apple-clang@14\]/\[gcc@13:13\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml spack env create ufs_utils-env spack_ci.yaml spack env activate ufs_utils-env sudo apt install cmake @@ -59,7 +59,7 @@ jobs: ufs_utils: needs: setup - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: checkout diff --git a/ci/spack.yaml b/ci/spack.yaml index ee8a4ee1b..567d894a9 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -2,7 +2,7 @@ spack: packages: all: - compiler: [oneapi, gcc@10:10, apple-clang@14] + compiler: [oneapi, gcc@13:13, apple-clang@14] specs: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1