Skip to content

Commit

Permalink
Merge branch 'develop' into lowres_grids
Browse files Browse the repository at this point in the history
  • Loading branch information
George Gayno committed Dec 17, 2024
2 parents 4f4de62 + 3c088ae commit 4ba550c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ubuntu_gcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -59,7 +59,7 @@ jobs:
ufs_utils:
needs: setup
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: checkout
Expand Down
2 changes: 1 addition & 1 deletion ci/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
spack:
packages:
all:
compiler: [oneapi, gcc@10:10, apple-clang@14]
compiler: [oneapi, gcc@13:13, apple-clang@14]
specs:
- [email protected]
- [email protected]
Expand Down

0 comments on commit 4ba550c

Please sign in to comment.