From 0b106df24b4e78a7ee30373a5241b62935c87cc7 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 17 Nov 2025 14:15:07 +1100 Subject: [PATCH 1/7] infra: Update to v3 --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7904064..fc47526 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,13 +31,14 @@ 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 + # builtin-spack-packages-ref: main + # access-spack-packages-ref: api-v2 # spack-config-ref: main - # spack-ref: releases/v0.22 + # spack-ref: releases/v1.0 secrets: spack-install-command-pat: ${{ secrets.SPACK_INSTALL_COMMAND_PAT }} From 882265f1ab127c876e58dc158331f7303168a6f1 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:09:07 +1100 Subject: [PATCH 2/7] [no-ci] infra: Update to spack v1.1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc47526..f0c6dd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,6 @@ jobs: # builtin-spack-packages-ref: main # access-spack-packages-ref: api-v2 # spack-config-ref: main - # spack-ref: releases/v1.0 + # spack-ref: releases/v1.1 secrets: spack-install-command-pat: ${{ secrets.SPACK_INSTALL_COMMAND_PAT }} From ebad9e54c62bded27039c5f5715834fd251d8b5a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 16:28:21 +1100 Subject: [PATCH 3/7] Update comments --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0c6dd2..297bbaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,9 +36,7 @@ jobs: 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 - # builtin-spack-packages-ref: main - # access-spack-packages-ref: api-v2 - # spack-config-ref: main - # spack-ref: releases/v1.1 + # 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 }} From cdb172ca5a7f2a74c91e64ae5694d9fd088c9661 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 4 May 2026 09:36:07 +1000 Subject: [PATCH 4/7] Redeploy to check build From d03ff9ca89e96b378d1b236586df1445f3143c10 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 4 May 2026 09:40:11 +1000 Subject: [PATCH 5/7] Update to use toolchains --- .github/build-ci/data/standard.json | 4 ++-- .../manifests/intel-access-esm1p5.spack.yaml.j2 | 12 ++++++------ .../build-ci/manifests/intel-cice4-mct.spack.yaml.j2 | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 616c3c3..f08826d 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -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" } diff --git a/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 b/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 index b4b296f..146ea03 100644 --- a/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 @@ -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: @@ -10,7 +10,7 @@ spack: - '@git.access-esm1.5-2025.03.002=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' @@ -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 \ No newline at end of file + unify: false diff --git a/.github/build-ci/manifests/intel-cice4-mct.spack.yaml.j2 b/.github/build-ci/manifests/intel-cice4-mct.spack.yaml.j2 index 3d0d028..997ab94 100644 --- a/.github/build-ci/manifests/intel-cice4-mct.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-cice4-mct.spack.yaml.j2 @@ -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 \ No newline at end of file + view: false From 6d9aa33b978bd8fcf6ab112993f5c0314a192261 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 11 May 2026 12:25:16 +1000 Subject: [PATCH 6/7] Update .github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 Co-authored-by: Aidan Heerdegen --- .github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 b/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 index 146ea03..0efadab 100644 --- a/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 @@ -7,7 +7,7 @@ spack: packages: mom5: require: - - '@git.access-esm1.5-2025.03.002=access-esm1.5' + - access-esm1p5 cice4: require: - '@git.{{ ref }}=access-esm1.5' From 38901743e5c94dc185c0ff88882907813fbf88e7 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 11 May 2026 15:28:44 +1000 Subject: [PATCH 7/7] Apply suggestions from code review Co-authored-by: Aidan Heerdegen --- .github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 b/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 index 0efadab..4db102d 100644 --- a/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access-esm1p5.spack.yaml.j2 @@ -3,11 +3,11 @@ # https://github.com/ACCESS-NRI/ACCESS-ESM1.5/blob/c3900a91c992ff2586e353339a41dbd274ae1afb/spack.yaml spack: specs: - - access-esm1p5@git.2024.12.1 + - access-esm1p5 packages: mom5: require: - - access-esm1p5 + - '@git.access-esm1.5-2025.03.002=access-esm1.5' cice4: require: - '@git.{{ ref }}=access-esm1.5'