From 7fa21ac2cef0c57f3a5aeb834285bf39568c6737 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 09:51:12 +1100 Subject: [PATCH 1/4] 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 2f0c3a174..8756aa350 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,13 +29,14 @@ jobs: max-parallel: 4 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 secrets: spack-install-command-pat: ${{ secrets.SPACK_INSTALL_COMMAND_PAT }} From 935a52a4651e69395ef5669fa324f6e0a92b368d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 10:03:41 +1100 Subject: [PATCH 2/4] [no ci] infra: update spack to 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 8756aa350..6239233c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,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 a6fd0a1a23867fe4b22eea2a8e42ce70fc3ca0c2 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Mar 2026 10:07:51 +1100 Subject: [PATCH 3/4] Update all manifests to use toolchains --- .github/build-ci/data/standard.json | 6 +++--- .../manifests/pr/intel_access-esm1.5.spack.yaml.j2 | 6 +++++- .../scheduled/gcc_mom_access-esm1.5.spack.yaml.j2 | 6 +++++- .../scheduled/intel_mom_access-esm1.5.spack.yaml.j2 | 6 +++++- .../scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2 | 7 ++++--- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index af1cb0632..4dd07aabb 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", "cice4_version": "git.access-esm1.5-2025.04.001=access-esm1.5", "um_version": "git.2024.10.17=access-esm1.5", "gcom4_version": "git.2024.05.28=access-esm1.5", diff --git a/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2 index b0a26c0d4..1f2c70539 100644 --- a/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2 @@ -26,9 +26,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/gcc_mom_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.5.spack.yaml.j2 index ed07c03ae..83b9045b4 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.5.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.5.spack.yaml.j2 @@ -14,9 +14,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_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.5.spack.yaml.j2 index 5128237c2..674914dbf 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.5.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.5.spack.yaml.j2 @@ -14,9 +14,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_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2 index ee0b041c3..de84f4ded 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2 @@ -14,12 +14,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers-classic: require: - - '%gcc' + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false From ccbc59469619d0089f46a49a9f55c8638bfea784 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Mar 2026 10:08:17 +1100 Subject: [PATCH 4/4] Add 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 6239233c5..df5128eb5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,9 +34,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 }}