From 3c368797da4a5e418297505e5cec595e0f009b04 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 17 Nov 2025 14:18:10 +1100 Subject: [PATCH 1/6] 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 00c2966b2..e0f1f34ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,11 +30,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 + # spack-ref: releases/v1.0 From bc53ebf6cec9676378660f9039f8946d751c565c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:09:53 +1100 Subject: [PATCH 2/6] [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 e0f1f34ab..980567ae5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,4 +38,4 @@ 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 From dfc4a113ba3e7f82ad3f0930b59c82ccbb2f1854 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 16:28:41 +1100 Subject: [PATCH 3/6] 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 980567ae5..8e7fbca00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,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 + # 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 e4498e97fbbae00a700f788351a7374bbc13fe93 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 2 Mar 2026 11:55:44 +1100 Subject: [PATCH 4/6] Update to spack-v1.1-style, update compiler defs to just version --- .github/build-ci/data/standard.json | 6 +++--- .github/build-ci/manifests/gcc-no-access3.spack.yaml.j2 | 6 +++++- .github/build-ci/manifests/intel-access3.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/intel-no-access3.spack.yaml.j2 | 6 +++++- .github/build-ci/manifests/oneapi-access3.spack.yaml.j2 | 9 +++++++-- .../build-ci/manifests/oneapi-no-access3.spack.yaml.j2 | 9 +++++++-- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 3aa9594d9..0022304fc 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -1,6 +1,6 @@ { - "gcc_compiler": "gcc@13.2.0", - "intel_compiler": "intel@2021.10.0", - "oneapi_compiler": "oneapi@2025.2.0", + "gcc_compiler_version": "13.2.0", + "intel_compiler_version": "2021.10.0", + "oneapi_compiler_version": "2025.2.0", "target": "x86_64" } diff --git a/.github/build-ci/manifests/gcc-no-access3.spack.yaml.j2 b/.github/build-ci/manifests/gcc-no-access3.spack.yaml.j2 index efdb30782..896938cb5 100644 --- a/.github/build-ci/manifests/gcc-no-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-no-access3.spack.yaml.j2 @@ -2,9 +2,13 @@ spack: specs: - access-cice @git.{{ ref }} ~access3 io_type=PIO packages: + 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-access3.spack.yaml.j2 b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 index e0e264c8f..2e29174a7 100644 --- a/.github/build-ci/manifests/intel-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 @@ -2,9 +2,13 @@ spack: specs: - access-cice @git.{{ ref }} +access3 io_type=PIO packages: + 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/intel-no-access3.spack.yaml.j2 b/.github/build-ci/manifests/intel-no-access3.spack.yaml.j2 index 3bb5a6f42..9890ba107 100644 --- a/.github/build-ci/manifests/intel-no-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-no-access3.spack.yaml.j2 @@ -4,9 +4,13 @@ spack: - access-cice @git.{{ ref }} ~access3 io_type=NetCDF - access-cice @git.{{ ref }} ~access3 io_type=Binary packages: + 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-access3.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-access3.spack.yaml.j2 index 8c8f41a9b..cab90126f 100644 --- a/.github/build-ci/manifests/oneapi-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-access3.spack.yaml.j2 @@ -5,10 +5,15 @@ spack: packages: gcc-runtime: require: - - '%gcc target={{ target }}' + - '%access_gcc' + - target={{ target }} + intel-oneapi-compilers: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target={{ target }}' + - '%access_oneapi' + - target={{ target }} concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/oneapi-no-access3.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-no-access3.spack.yaml.j2 index dfe967b29..40c05942e 100644 --- a/.github/build-ci/manifests/oneapi-no-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-no-access3.spack.yaml.j2 @@ -7,10 +7,15 @@ spack: packages: gcc-runtime: require: - - '%gcc target={{ target }}' + - '%access_gcc' + - target={{ target }} + intel-oneapi-compilers: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target={{ target }}' + - '%access_oneapi' + - target={{ target }} concretizer: unify: false view: false From 76d2262cef2208ec8df4e6a3b93acb0335200647 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 2 Mar 2026 14:13:40 +1100 Subject: [PATCH 5/6] Update to python upstream to sidestep segfault issue --- .github/build-ci/manifests/intel-access3.spack.yaml.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/build-ci/manifests/intel-access3.spack.yaml.j2 b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 index 2e29174a7..0a2ef746d 100644 --- a/.github/build-ci/manifests/intel-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 @@ -2,6 +2,9 @@ spack: specs: - access-cice @git.{{ ref }} +access3 io_type=PIO packages: + python: + require: + - '@3.11.14' intel-oneapi-compilers-classic: require: - '@{{ intel_compiler_version }}' From b9de7e7bd3b80723df2aec2c4da9dbd0e2c46423 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 2 Mar 2026 15:04:44 +1100 Subject: [PATCH 6/6] [no ci] Added comment on why we're pinning --- .github/build-ci/manifests/intel-access3.spack.yaml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/build-ci/manifests/intel-access3.spack.yaml.j2 b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 index 0a2ef746d..2a812431a 100644 --- a/.github/build-ci/manifests/intel-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 @@ -2,6 +2,8 @@ spack: specs: - access-cice @git.{{ ref }} +access3 io_type=PIO packages: + # We pin a version of python as spack v1.1 has trouble building the default latest + # python@3.14.3%intel@2021.10.0 due to a segfault. python: require: - '@3.11.14'