From 550e1ffd9ce1822c90a1878773d07d1c527d16fb Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 17 Nov 2025 14:13:35 +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 0030cacce..69b621328 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,13 +32,14 @@ jobs: exclude: # TODO: Remove this exclusion once https://github.com/ACCESS-NRI/GCOM4/issues/15 is fixed - file: .github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 - 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 }} spack-manifest-data-path: .github/build-ci/data/standard.json allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job - # 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 cc55e806639f3bbf098b39a96f670a548acac614 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:08:41 +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 69b621328..c1e0f9fb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,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 f6f46c03f5e674f82099b8a226358fe76d9640e7 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 16:26:35 +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 c1e0f9fb2..dffc67134 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,9 +37,7 @@ jobs: spack-manifest-path: ${{ matrix.file }} spack-manifest-data-path: .github/build-ci/data/standard.json allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job - # 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 e3123f65b7d6c665169ba403f743f256fa3ee6c5 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Mar 2026 09:59:01 +1100 Subject: [PATCH 4/7] Update literally all the manifests to use toolchains --- .github/build-ci/data/standard.json | 6 +++--- .../build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 | 6 +++++- .github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 | 6 +++++- .../manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 | 6 +++++- .../scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/intel_mom-sis.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/intel_mom-solo.spack.yaml.j2 | 6 +++++- .../scheduled/intel_mom_access-esm1.6.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 | 6 +++++- .../scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 | 6 +++++- .../scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 | 6 +++++- .../manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 | 6 +++++- .../oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 | 6 +++++- 22 files changed, 108 insertions(+), 24 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 43201a31a..42b582bea 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -1,7 +1,7 @@ { - "intel_compiler": "intel@2021.10.0", - "gcc_compiler": "gcc@13.2.0", - "oneapi_compiler": "oneapi@2025.2.0", + "intel_compiler_version": "2021.10.0", + "gcc_compiler_version": "13.2.0", + "oneapi_compiler_version": "2025.2.0", "cice5_version": "2026.01.000", "um_version": "git.2026.02.000=access-esm1.6", "cable_version": "2025.11.000", diff --git a/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 index 83ef2d43e..88bb8bfcd 100644 --- a/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 @@ -40,9 +40,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 index 50a3d8b7f..28b215d7d 100644 --- a/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 @@ -37,9 +37,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 index a83ed2736..f3c3749cd 100644 --- a/.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 @@ -40,9 +40,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 index 1fc02ce82..3231cc6aa 100644 --- a/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 @@ -37,9 +37,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 index b483055b3..16d42c164 100644 --- a/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 @@ -43,9 +43,13 @@ spack: gcc-runtime: require: - '%gcc' + intel-oneapi-compilers: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 index 7c5f885e5..5433e3329 100644 --- a/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 @@ -40,9 +40,13 @@ spack: gcc-runtime: require: - '%gcc' + intel-oneapi-compilers: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 index 792d3f8c2..985e96092 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 index 56185a6d2..fac094a16 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 index e7ee1aab8..2f977d2e4 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 @@ -23,9 +23,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 index f993f4644..12c029e1c 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 index 2daab1954..bf58687a4 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/intel_mom-sis.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom-sis.spack.yaml.j2 index 6bd83ac27..744bf8f28 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom-sis.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom-sis.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/intel_mom-solo.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom-solo.spack.yaml.j2 index 06d72b789..1fb6b96fa 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom-solo.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom-solo.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 index 041db49bb..9e0edcf5e 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 @@ -23,9 +23,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 index 1cba66d1b..926df2073 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 index ef55bd8f8..802fff120 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 index 483f09a0a..87308e1b7 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 @@ -14,9 +14,13 @@ spack: gcc-runtime: require: - '%gcc' + intel-oneapi-compilers-classic: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 index 74f7e89e1..776e1e728 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 @@ -14,9 +14,13 @@ spack: gcc-runtime: require: - '%gcc' + intel-oneapi-compilers-classic: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 index 7c6447667..e1f956695 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 @@ -26,9 +26,13 @@ spack: gcc-runtime: require: - '%gcc' + intel-oneapi-compilers-classic: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 index a4c1b7d02..cd1a5df1b 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 @@ -31,9 +31,13 @@ spack: gcc-runtime: require: - '%gcc' + intel-oneapi-compilers-classic: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 index 554897b7c..9188af580 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 @@ -31,9 +31,13 @@ spack: gcc-runtime: require: - '%gcc' + intel-oneapi-compilers-classic: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false From 2d05c9523d8829392d71d33b305fa2fb240a1fb0 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Mar 2026 10:09:50 +1100 Subject: [PATCH 5/7] Remove gcc-runtime constraints --- .../build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 | 3 --- .github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 | 3 --- .../build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 | 3 --- .../build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 | 3 --- .../manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 | 3 --- .../manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 | 3 --- .../scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 | 3 --- 7 files changed, 21 deletions(-) diff --git a/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 index 16d42c164..51d94d32b 100644 --- a/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 @@ -40,9 +40,6 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: - require: - - '%gcc' intel-oneapi-compilers: require: - '@{{ oneapi_compiler_version }}' diff --git a/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 index 5433e3329..d522e0cc5 100644 --- a/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 @@ -37,9 +37,6 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: - require: - - '%gcc' intel-oneapi-compilers: require: - '@{{ oneapi_compiler_version }}' diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 index 87308e1b7..5599b1b36 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 @@ -11,9 +11,6 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: - require: - - '%gcc' intel-oneapi-compilers-classic: require: - '@{{ oneapi_compiler_version }}' diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 index 776e1e728..1cdd723d5 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 @@ -11,9 +11,6 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: - require: - - '%gcc' intel-oneapi-compilers-classic: require: - '@{{ oneapi_compiler_version }}' diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 index e1f956695..55d048eac 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 @@ -23,9 +23,6 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: - require: - - '%gcc' intel-oneapi-compilers-classic: require: - '@{{ oneapi_compiler_version }}' diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 index cd1a5df1b..0504d20ac 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 @@ -28,9 +28,6 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: - require: - - '%gcc' intel-oneapi-compilers-classic: require: - '@{{ oneapi_compiler_version }}' diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 index 9188af580..df8d6a267 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 @@ -28,9 +28,6 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: - require: - - '%gcc' intel-oneapi-compilers-classic: require: - '@{{ oneapi_compiler_version }}' From 6fb39c6e55f42800e51b61fcc1ddc3fa174d4e39 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 13 Mar 2026 14:38:46 +1100 Subject: [PATCH 6/7] Apply suggestions from code review Co-authored-by: Dougie Squire --- .github/build-ci/data/standard.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 42b582bea..eda44466e 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -6,7 +6,7 @@ "um_version": "git.2026.02.000=access-esm1.6", "cable_version": "2025.11.000", "gcom4_version": "git.2025.08.000=access-esm1.5", - "libaccessom2_version": "git.2025.05.001=access-om2", + "libaccessom2_version": "git.2026.02.000=access-om2", "oasis3_mct_version_esm1p6": "5.2", "oasis3_mct_version_om2": "git.2025.03.001=stable", "netcdf_c_version": "4.9.2", @@ -14,6 +14,6 @@ "parallelio_version": "2.6.8", "openmpi_version": "5.0.8", "access_fms_version": "git.mom5-2025.08.000=mom5", - "access_generic_tracers_version": "2026.01.000", + "access_generic_tracers_version": "2026.02.000", "access_mocsy_version": "2025.07.002" } From 0c8cb54fda079f8e02fd38d88b133964d579ffee Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 13 Mar 2026 14:42:21 +1100 Subject: [PATCH 7/7] Remove explicit grid sizes in cice5 *access-om2.spack.yaml.j2 --- .github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 | 1 - .github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 | 1 - .github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 index 28b215d7d..ef073eef7 100644 --- a/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 @@ -9,7 +9,6 @@ spack: require: - '@{{ cice5_version }}' - 'io_type=PIO build_system=cmake' - - 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size libaccessom2: require: - '@{{ libaccessom2_version }}' diff --git a/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 index 3231cc6aa..a4c9bec45 100644 --- a/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 @@ -9,7 +9,6 @@ spack: require: - '@{{ cice5_version }}' - 'io_type=PIO build_system=cmake' - - 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size libaccessom2: require: - '@{{ libaccessom2_version }}' diff --git a/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 index d522e0cc5..07ca3004f 100644 --- a/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 @@ -9,7 +9,6 @@ spack: require: - '@{{ cice5_version }}' - 'io_type=PIO build_system=cmake' - - 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size libaccessom2: require: - '@{{ libaccessom2_version }}'