From 4bcdbf4a5438ad012048e85f698e41911f5d027e Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 14:05:55 +1100 Subject: [PATCH 01/10] [no ci] infra: Update to v8 --- .github/workflows/cd.yml | 6 +++--- .github/workflows/ci.yml | 11 +++++------ config/versions.json | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 791d8aa..8f56409 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,12 +10,12 @@ on: jobs: cd: name: CD - uses: access-nri/build-cd/.github/workflows/cd.yml@v7 + uses: access-nri/build-cd/.github/workflows/cd.yml@v8 with: model: ${{ vars.NAME }} root-sbd: access-esm1p5 - spack-manifest-schema-version: 1-0-7 - config-versions-schema-version: 3-0-0 + spack-manifest-schema-version: 2-0-0 + config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 permissions: contents: write diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 802f39a..45ccaf8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,15 +18,14 @@ on: jobs: pr-ci: name: CI - if: >- - github.event.action != 'closed' - uses: access-nri/build-cd/.github/workflows/ci.yml@v7 + if: github.event.action != 'closed' + uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: model: ${{ vars.NAME }} root-sbd: access-esm1p5 pr: ${{ github.event.pull_request.number }} - spack-manifest-schema-version: 1-0-7 - config-versions-schema-version: 3-0-0 + spack-manifest-schema-version: 2-0-0 + config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 permissions: pull-requests: write @@ -36,7 +35,7 @@ jobs: pr-closed: name: Closed if: github.event.action == 'closed' - uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v7 + uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8 with: root-sbd: access-esm1p5 secrets: inherit diff --git a/config/versions.json b/config/versions.json index 194eb11..79044e7 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", - "spack": "0.22", - "spack-packages": "2025.03.006" + "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json", + "spack": "1.0", + "access-spack-packages": "2025.03.006" } From 5658fcadc5c503a4d45dee2735383504d2226164 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:49:39 +1100 Subject: [PATCH 02/10] [no ci] infra: Update spack version to v1.1, update manifest schema to 2-0-0 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 79044e7..1fa4bbe 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json", - "spack": "1.0", + "spack": "1.1", "access-spack-packages": "2025.03.006" } From 198bb500b8eae2a3f74cbad19f33b521f5f016ba Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 15:47:25 +1100 Subject: [PATCH 03/10] [no ci] spack.yaml: Dedent list elements for spack-style manifests --- spack.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spack.yaml b/spack.yaml index 7fd3781..3284c7d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,7 +4,7 @@ # configuration settings. spack: specs: - - access-esm1p5@git.2024.12.1 + - access-esm1p5@git.2024.12.1 packages: # Direct ACCESS-NRI dependencies # Note: some packages have branch-specific logic and hence can't use @@ -12,38 +12,38 @@ spack: # requiring a `@git.DATE=BRANCH` version. mom5: require: - - '@git.access-esm1.5-2025.03.002=access-esm1.5' + - '@git.access-esm1.5-2025.03.002=access-esm1.5' cice4: require: - - '@git.access-esm1.5-2025.04.001=access-esm1.5' + - '@git.access-esm1.5-2025.04.001=access-esm1.5' um7: require: - - '@git.2024.10.17=access-esm1.5' + - '@git.2024.10.17=access-esm1.5' # Lower-level ACCESS-NRI dependencies gcom4: require: - - '@git.2024.05.28=access-esm1.5' + - '@git.2024.05.28=access-esm1.5' oasis3-mct: require: - - '@git.access-esm1.5_2024.05.24=access-esm1.5' + - '@git.access-esm1.5_2024.05.24=access-esm1.5' # Other dependencies openmpi: require: - - '@4.0.2' + - '@4.0.2' netcdf-c: require: - - '@4.7.4' + - '@4.7.4' netcdf-fortran: require: - - '@4.5.2' + - '@4.5.2' hdf5: require: - - '@1.10.11' + - '@1.10.11' # Preferences for all packages all: require: - - '%intel@19.0.3.199' - - 'target=x86_64_v4' + - '%intel@19.0.3.199' + - 'target=x86_64_v4' view: true concretizer: unify: true @@ -52,4 +52,4 @@ spack: root: $spack/../restricted/ukmo/release source_cache: $spack/../restricted/ukmo/source_cache build_stage: - - $TMPDIR/restricted/spack-stage + - $TMPDIR/restricted/spack-stage From b14df0bf8d847ba01f7784ad83178d963a51e3cd Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 15:48:36 +1100 Subject: [PATCH 04/10] [no ci] spack.yaml: Add reserved definitions --- spack.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 3284c7d..b22cc90 100644 --- a/spack.yaml +++ b/spack.yaml @@ -3,8 +3,12 @@ # It describes a set of packages to be installed, along with # configuration settings. spack: + definitions: + # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise + - _name: [access-esm1p5] + - _version: [2024.12.1] specs: - - access-esm1p5@git.2024.12.1 + - access-esm1p5 packages: # Direct ACCESS-NRI dependencies # Note: some packages have branch-specific logic and hence can't use From 93097a160380e7e345f43c4dcc0f869243844ab7 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 15:50:03 +1100 Subject: [PATCH 05/10] [no ci] versions.json,spack.yaml: Add ukmo-restricted-scope to custom-scopes rather than environment --- config/versions.json | 3 ++- spack.yaml | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config/versions.json b/config/versions.json index 1fa4bbe..484bce7 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json", "spack": "1.1", - "access-spack-packages": "2025.03.006" + "access-spack-packages": "2025.03.006", + "custom-scopes": ["ukmo-restricted-scope"] } diff --git a/spack.yaml b/spack.yaml index b22cc90..412d7ea 100644 --- a/spack.yaml +++ b/spack.yaml @@ -51,9 +51,3 @@ spack: view: true concretizer: unify: true - config: - install_tree: - root: $spack/../restricted/ukmo/release - source_cache: $spack/../restricted/ukmo/source_cache - build_stage: - - $TMPDIR/restricted/spack-stage From a8faf462a39cbd09ad7dcb6cff13c74a3c5f874f Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 15:57:14 +1100 Subject: [PATCH 06/10] [no ci] spack.yaml: Use toolchains --- spack.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 412d7ea..0d0b95d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -43,10 +43,14 @@ spack: hdf5: require: - '@1.10.11' + # Compilers + intel-oneapi-compilers-classic: + require: + - '@19.0.3.199' # Preferences for all packages all: require: - - '%intel@19.0.3.199' + - '%access_intel' - 'target=x86_64_v4' view: true concretizer: From ebb2e1e260434adbd3cca449520dcbd1bec26781 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 20 Jan 2026 15:50:21 +1100 Subject: [PATCH 07/10] [no ci] Remove inputs.pr and inputs.root-sbd, updated versions in ci-comment --- .github/workflows/cd.yml | 1 - .github/workflows/ci-command.yml | 14 +++++--------- .github/workflows/ci.yml | 4 ---- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8f56409..02f6d49 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -13,7 +13,6 @@ jobs: uses: access-nri/build-cd/.github/workflows/cd.yml@v8 with: model: ${{ vars.NAME }} - root-sbd: access-esm1p5 spack-manifest-schema-version: 2-0-0 config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 diff --git a/.github/workflows/ci-command.yml b/.github/workflows/ci-command.yml index d9a5754..9d74435 100644 --- a/.github/workflows/ci-command.yml +++ b/.github/workflows/ci-command.yml @@ -8,14 +8,12 @@ jobs: redeploy: name: Redeploy if: startsWith(github.event.comment.body, '!redeploy') && github.event.issue.pull_request - uses: access-nri/build-cd/.github/workflows/ci.yml@v7 + uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: model: ${{ vars.NAME }} - pr: ${{ github.event.issue.number }} - spack-manifest-schema-version: 1-0-7 - config-versions-schema-version: 3-0-0 + spack-manifest-schema-version: 2-0-0 + config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 - root-sbd: access-esm1p5 permissions: pull-requests: write contents: write @@ -24,10 +22,9 @@ jobs: bump: name: Bump if: startsWith(github.event.comment.body, '!bump') && github.event.issue.pull_request - uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v7 + uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v8 with: model: ${{ vars.NAME }} - root-sbd: access-esm1p5 permissions: pull-requests: write contents: write @@ -35,11 +32,10 @@ jobs: configs: name: Configs if: startsWith(github.event.comment.body, '!update-configs') && github.event.issue.pull_request - uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@v7 + uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@v8 with: model: ${{ vars.NAME }} auto-configs-pr-schema-version: 1-0-0 - root-sbd: access-esm1p5 permissions: pull-requests: write secrets: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45ccaf8..5e9feaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,6 @@ jobs: uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: model: ${{ vars.NAME }} - root-sbd: access-esm1p5 - pr: ${{ github.event.pull_request.number }} spack-manifest-schema-version: 2-0-0 config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 @@ -36,6 +34,4 @@ jobs: name: Closed if: github.event.action == 'closed' uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8 - with: - root-sbd: access-esm1p5 secrets: inherit From 3208ca9127c0cb2591a065a9d28c2a2800c5c36c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 11 Feb 2026 09:03:22 +1100 Subject: [PATCH 08/10] [no ci] Update config/versions.json access-spack-packages version to common api-v2 tag --- config/versions.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/versions.json b/config/versions.json index 484bce7..fea1936 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,6 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json", "spack": "1.1", - "access-spack-packages": "2025.03.006", - "custom-scopes": ["ukmo-restricted-scope"] + "access-spack-packages": "2026.02.002", + "custom-scopes": [ + "ukmo-restricted-scope" + ] } From 8c3cdc1361fba1a9de17ea50b0c041a8aa3e671a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 10:07:57 +1100 Subject: [PATCH 09/10] [no ci] Add language constraints --- spack.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 0d0b95d..b207f9e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -44,13 +44,19 @@ spack: require: - '@1.10.11' # Compilers - intel-oneapi-compilers-classic: + c: require: - - '@19.0.3.199' + - intel-oneapi-compilers-classic@19.0.3.199 + cxx: + require: + - intel-oneapi-compilers-classic@19.0.3.199 + fortran: + require: + - intel-oneapi-compilers-classic@19.0.3.199 + # Preferences for all packages all: require: - - '%access_intel' - 'target=x86_64_v4' view: true concretizer: From 223d1eb19ee3052fb194e8c314c045257d14a68c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 18 Feb 2026 12:16:49 +1100 Subject: [PATCH 10/10] [no ci] Add target preference rather than requirement --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index b207f9e..111bbdf 100644 --- a/spack.yaml +++ b/spack.yaml @@ -56,7 +56,7 @@ spack: # Preferences for all packages all: - require: + prefer: - 'target=x86_64_v4' view: true concretizer: