Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/build-ci/data/standard.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"gcc_compiler": "gcc@13.2.0",
"intel_compiler": "intel@2021.10.0",
"gcc_compiler_version": "13.2.0",
"intel_compiler_version": "2021.10.0",
"target": "x86_64"
}
12 changes: 6 additions & 6 deletions .github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Building CICE4 in the context of the ACCESS-ESM1.5 model
# Using the ACCESS-ESM1.5 spack.yaml from
# Using the ACCESS-ESM1.5 spack.yaml from
# https://github.com/ACCESS-NRI/ACCESS-ESM1.5/blob/c3900a91c992ff2586e353339a41dbd274ae1afb/spack.yaml
spack:
specs:
Expand All @@ -10,7 +10,7 @@ spack:
- '@git.access-esm1.5-2025.03.002=access-esm1.5'
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- '@git.access-esm1.5-2025.03.002=access-esm1.5'
- access-esm1p5

I think we just want to check against the most recent version of ACCESS-ESM1.5

cice4:
require:
- '@git.access-esm1.5-2025.04.001=access-esm1.5'
- '@git.{{ ref }}=access-esm1.5'
um7:
require:
- '@git.2024.10.17=access-esm1.5'
Expand All @@ -32,13 +32,13 @@ spack:
hdf5:
require:
- '@1.10.11'
gcc-runtime:
intel-oneapi-compilers-classic:
require:
- '%gcc target={{ target }}'
- '@{{ intel_compiler_version }}'
all:
require:
- '%{{ intel_compiler }}'
- '%access_intel'
- 'target={{ target }}'
view: false
concretizer:
unify: false
unify: false
7 changes: 5 additions & 2 deletions .github/build-ci/manifests/intel-cice4-mct.spack.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ spack:
hdf5:
require:
- '@1.10.11'
intel-oneapi-compilers-classic:
require:
- '@{{ intel_compiler_version }}'
all:
require:
- '%{{ intel_compiler }}'
- '%access_intel'
- 'target={{ target }}'
concretizer:
unify: false
view: false
view: false
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ jobs:
max-parallel: 5
matrix:
file: ${{ fromJson(needs.pre-ci.outputs.matrix) }}
uses: access-nri/build-ci/.github/workflows/ci.yml@v2
uses: access-nri/build-ci/.github/workflows/ci.yml@v3
with:
spack-manifest-path: ${{ matrix.file }}
allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job
spack-manifest-data-path: .github/build-ci/data/standard.json
# spack-packages-ref: main
# spack-config-ref: main
# spack-ref: releases/v0.22
# Default args (including explicit spack/spack-packages/spack-config versions)
# are specified in https://github.com/ACCESS-NRI/build-ci/tree/v3/.github/workflows#inputs
secrets:
spack-install-command-pat: ${{ secrets.SPACK_INSTALL_COMMAND_PAT }}
Loading