From fde4df56db215fdfcc77b2879841e9a4abca674f Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 17 Nov 2025 14:24:52 +1100 Subject: [PATCH 1/5] 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 adc856d..549e3b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,11 +29,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 + # builtin-spack-packages-ref: main + # access-spack-packages-ref: api-v2 # spack-config-ref: main - # spack-ref: releases/v0.22 \ No newline at end of file + # spack-ref: releases/v1.0 \ No newline at end of file From 5bb65e07a261d88f0d1f763c82e5cc2300f9f930 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:10:29 +1100 Subject: [PATCH 2/5] [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 549e3b3..b44e98c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,4 +37,4 @@ jobs: # builtin-spack-packages-ref: main # access-spack-packages-ref: api-v2 # spack-config-ref: main - # spack-ref: releases/v1.0 \ No newline at end of file + # spack-ref: releases/v1.1 \ No newline at end of file From ed7a140b07cf8ba94d2cd272d16d7ea86e79bce7 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 16:29:46 +1100 Subject: [PATCH 3/5] 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 b44e98c..bbecfbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,5 @@ 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 \ No newline at end of file + # 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 From 82c3f352f5924aae684f7f3c398958b3fbcb1828 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Mar 2026 09:32:39 +1100 Subject: [PATCH 4/5] Update to toolchains --- .github/build-ci/data/standard.json | 6 +++--- .github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 | 8 +++++++- .github/build-ci/manifests/intel-access-om2.spack.yaml.j2 | 7 ++++++- .../build-ci/manifests/oneapi-access-om2.spack.yaml.j2 | 7 ++++--- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 8d57d36..4b017c0 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", "target": "x86_64", "mom5_version": "git.2025.08.000=access-om2", "cice5_version": "git.2025.03.001=access-om2", diff --git a/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 index f846e6f..e003383 100644 --- a/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 @@ -35,9 +35,15 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + + # Compilers + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target={{ target }}' + - '%access_gcc' + - 'target={{ target }}' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 index 944a916..8b748e3 100644 --- a/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 @@ -35,9 +35,14 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + # Compilers + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target={{ target }}' + - '%access_intel' + - 'target={{ target }}' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 index 32bc55e..bb2b4b2 100644 --- a/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 @@ -35,12 +35,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers: require: - - '%gcc' + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target={{ target }}' + - '%access_oneapi' + - 'target={{ target }}' concretizer: unify: false view: false From 5a460178f548fef95ddd36b0122a2a1b4ffcd8d6 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Fri, 13 Mar 2026 14:06:12 +1100 Subject: [PATCH 5/5] Build-CI: Update dependency versions --- .github/build-ci/data/standard.json | 14 +++++++------- .../manifests/gcc-access-om2.spack.yaml.j2 | 1 + .../manifests/intel-access-om2.spack.yaml.j2 | 1 + .../manifests/oneapi-access-om2.spack.yaml.j2 | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 4b017c0..2b05dcd 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -3,14 +3,14 @@ "gcc_compiler_version": "13.2.0", "oneapi_compiler_version": "2025.2.0", "target": "x86_64", - "mom5_version": "git.2025.08.000=access-om2", - "cice5_version": "git.2025.03.001=access-om2", - "oasis3_mct_version": "git.2025.03.001=access-om2", + "mom5_version": "git.2026.02.000=access-om2", + "cice5_version": "2026.01.000", + "oasis3_mct_version": "git.2025.03.001=stable", "netcdf_c_version": "4.9.2", "netcdf_fortran_version": "4.6.1", - "parallelio_version": "2.6.2", - "openmpi_version": "5.0.5", - "access_fms_version": "git.mom5-2025.05.000=mom5", - "access_generic_tracers_version": "2025.07.002", + "parallelio_version": "2.6.8", + "openmpi_version": "5.0.8", + "access_fms_version": "git.mom5-2025.08.000=mom5", + "access_generic_tracers_version": "2026.02.000", "access_mocsy_version": "2025.07.002" } diff --git a/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 index e003383..e56a0fc 100644 --- a/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 @@ -8,6 +8,7 @@ spack: cice5: require: - '@{{ cice5_version }}' + - 'io_type=PIO build_system=cmake' libaccessom2: require: - '@git.{{ ref }}=access-om2' diff --git a/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 index 8b748e3..172e852 100644 --- a/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 @@ -8,6 +8,7 @@ spack: cice5: require: - '@{{ cice5_version }}' + - 'io_type=PIO build_system=cmake' libaccessom2: require: - '@git.{{ ref }}=access-om2' diff --git a/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 index bb2b4b2..19a2e55 100644 --- a/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 @@ -8,6 +8,7 @@ spack: cice5: require: - '@{{ cice5_version }}' + - 'io_type=PIO build_system=cmake' libaccessom2: require: - '@git.{{ ref }}=access-om2'