From a995836d5a9df9f3f7cb1c6430c3c1a59a0fbb18 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 17 Nov 2025 14:17:39 +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 fddaf66a15..a89b93fe1b 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 3a52d8eb7e7c9f0f375c9c9b47bb3e61653396b5 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:08:58 +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 a89b93fe1b..97947042e7 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 b7e11642ceac65b774169f971ca81b6e72c27fd9 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 16:27:31 +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 97947042e7..378fe0e708 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 2ac7f5525f10e99d27edae30bb4e773d70b0cf83 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 27 Feb 2026 15:31:59 +1100 Subject: [PATCH 4/5] Update to spack v1.1 style, changed data 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 3aa9594d95..0022304fce 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 9124829a9b..57fac0272d 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-ww3 @git.{{ ref }} ~access3 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 4c488eaf92..fa7a741616 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-ww3 @git.{{ ref }} +access3 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 8596347c63..7640cfbfd7 100644 --- a/.github/build-ci/manifests/intel-no-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-no-access3.spack.yaml.j2 @@ -2,9 +2,13 @@ spack: specs: - access-ww3 @git.{{ ref }} ~access3 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 bfa80ecd56..ce7f7e3782 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 0d5d1e7ef5..8c875f2274 100644 --- a/.github/build-ci/manifests/oneapi-no-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-no-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 From 61137e35922b1ad2c79f45c64df109508805d89d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 2 Mar 2026 15:27:16 +1100 Subject: [PATCH 5/5] Pin python to avoid default latest segfault --- .github/build-ci/manifests/intel-access3.spack.yaml.j2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/build-ci/manifests/intel-access3.spack.yaml.j2 b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 index fa7a741616..149eb729ef 100644 --- a/.github/build-ci/manifests/intel-access3.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access3.spack.yaml.j2 @@ -2,6 +2,11 @@ spack: specs: - access-ww3 @git.{{ ref }} +access3 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' intel-oneapi-compilers-classic: require: - '@{{ intel_compiler_version }}'