From 2afaa080335e25c335cd673a9ef1670c11fef964 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 17 Nov 2025 14:15:37 +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 726b2f5..28dc4e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,11 +28,12 @@ jobs: max-parallel: 3 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 }} 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 From bc9db134c541889e8ecaa9249653a8952bf17751 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:09:26 +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 28dc4e6..a38526e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,4 +36,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 19e40ef219599be806619fbc947c55f2923fad02 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 16:28:05 +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 a38526e..d8693a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,5 @@ 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 From cd078cb769896d37234918fdc1dc99940690d9b4 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 11 Mar 2026 15:41:35 +1100 Subject: [PATCH 4/6] Update to toolchains --- .github/build-ci/data/standard.json | 6 +++--- .github/build-ci/manifests/gcc.spack.yaml.j2 | 6 +++++- .github/build-ci/manifests/intel.spack.yaml.j2 | 6 +++++- .github/build-ci/manifests/oneapi.spack.yaml.j2 | 7 ++++--- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 04fe0ca..6c6370b 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -1,5 +1,5 @@ { - "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" } diff --git a/.github/build-ci/manifests/gcc.spack.yaml.j2 b/.github/build-ci/manifests/gcc.spack.yaml.j2 index 8f75309..c33c74c 100644 --- a/.github/build-ci/manifests/gcc.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc.spack.yaml.j2 @@ -3,9 +3,13 @@ spack: # *_compiler is defined in the .github/build-ci/data/standard.json file - access-mocsy@git.{{ ref }} packages: + 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/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2 index 8d3b7f5..3afe401 100644 --- a/.github/build-ci/manifests/intel.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel.spack.yaml.j2 @@ -3,9 +3,13 @@ spack: # *_compiler is defined in the .github/build-ci/data/standard.json file - access-mocsy@git.{{ ref }} packages: + intel-oneapi-compiler-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/oneapi.spack.yaml.j2 b/.github/build-ci/manifests/oneapi.spack.yaml.j2 index 845fbd8..c9733ec 100644 --- a/.github/build-ci/manifests/oneapi.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi.spack.yaml.j2 @@ -3,12 +3,13 @@ spack: # *_compiler is defined in the .github/build-ci/data/standard.json file - access-mocsy@git.{{ ref }} packages: - gcc-runtime: + intel-oneapi-compilers: require: - - '%gcc' + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false From 450839c0ebf57e912c25c0cf7c63432d36fec552 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Fri, 13 Mar 2026 15:23:49 +1100 Subject: [PATCH 5/6] Build-CI: Use 'stable' spack version in manifests --- .github/build-ci/manifests/gcc.spack.yaml.j2 | 2 +- .github/build-ci/manifests/intel.spack.yaml.j2 | 2 +- .github/build-ci/manifests/oneapi.spack.yaml.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/build-ci/manifests/gcc.spack.yaml.j2 b/.github/build-ci/manifests/gcc.spack.yaml.j2 index c33c74c..b4e98f7 100644 --- a/.github/build-ci/manifests/gcc.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc.spack.yaml.j2 @@ -1,7 +1,7 @@ spack: specs: # *_compiler is defined in the .github/build-ci/data/standard.json file - - access-mocsy@git.{{ ref }} + - access-mocsy@git.{{ ref }}=stable packages: gcc: require: diff --git a/.github/build-ci/manifests/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2 index 3afe401..309cdea 100644 --- a/.github/build-ci/manifests/intel.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel.spack.yaml.j2 @@ -1,7 +1,7 @@ spack: specs: # *_compiler is defined in the .github/build-ci/data/standard.json file - - access-mocsy@git.{{ ref }} + - access-mocsy@git.{{ ref }}=stable packages: intel-oneapi-compiler-classic: require: diff --git a/.github/build-ci/manifests/oneapi.spack.yaml.j2 b/.github/build-ci/manifests/oneapi.spack.yaml.j2 index c9733ec..9eee10b 100644 --- a/.github/build-ci/manifests/oneapi.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi.spack.yaml.j2 @@ -1,7 +1,7 @@ spack: specs: # *_compiler is defined in the .github/build-ci/data/standard.json file - - access-mocsy@git.{{ ref }} + - access-mocsy@git.{{ ref }}=stable packages: intel-oneapi-compilers: require: From ae03a5989236436dc128562d041d69efcf301338 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 30 Apr 2026 17:04:01 +1000 Subject: [PATCH 6/6] Change to rebuild