From 4e342c4e46371f5992b17446ad7f68e30ca0f9bf Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 14:07:45 +1100 Subject: [PATCH 01/11] [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 4abe3c0..02f6d49 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,11 +10,11 @@ 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 }} - 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 753d4be..e9ea5b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,14 +17,13 @@ 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 }} 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 @@ -34,7 +33,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: ${{ vars.NAME }} secrets: inherit diff --git a/config/versions.json b/config/versions.json index c66cc11..7c22d7d 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/3-0-0.json", - "spack": "0.22", - "spack-packages": "2025.09.004" + "$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.09.004" } From a188e23587eddf2c39b60b22dbae90e9a9b0a6f6 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:50:17 +1100 Subject: [PATCH 02/11] [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 7c22d7d..5dc4cbd 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.09.004" } From aa2dafb20677d92c9394562f02a98542c6824b9a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:38:21 +1100 Subject: [PATCH 03/11] [no ci] spack.yaml: Dedent list elements for spack-style manifests --- spack.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/spack.yaml b/spack.yaml index e787e4f..4f92bf2 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,44 +4,44 @@ # configuration settings. spack: specs: - - access-am3@git.2026.02.000 + - access-am3@git.2026.02.000 packages: # Direct dependencies um: require: - - '@13.1' - - model="vn13p1-am" - - jules_ref="2026.01.0" - - um_ref="2026.01.0" + - '@13.1' + - model="vn13p1-am" + - jules_ref="2026.01.0" + - um_ref="2026.01.0" # Indirect dependencies netcdf-c: require: - - '@4.9.2' + - '@4.9.2' netcdf-fortran: require: - - '@4.5.2' + - '@4.5.2' fcm: require: - - '@2021.05.0' - # TODO: Generalize this Gadi-specific variant for spack.yaml - - 'site=nci-gadi' + - '@2021.05.0' + # TODO: Generalize this Gadi-specific variant for spack.yaml + - 'site=nci-gadi' gcom: require: - - '@7.9' + - '@7.9' openmpi: require: - - '@4.1.7' + - '@4.1.7' # Specifications that apply to all packages all: require: - - '%intel@2021.10.0' - - target=x86_64_v4 + - '%intel@2021.10.0' + - target=x86_64_v4 view: true concretizer: unify: true From c273a861a4f7cd20ef3a840718edb3bfc3d9a4c3 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:39:12 +1100 Subject: [PATCH 04/11] [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 4f92bf2..8db551d 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-am3] + - _version: [2026.02.000] specs: - - access-am3@git.2026.02.000 + - access-am3 packages: # Direct dependencies um: From 0014cb2399850e6458ee0016f1dc613ab21210f3 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:40:17 +1100 Subject: [PATCH 05/11] [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 8db551d..4441b7e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -40,11 +40,15 @@ spack: openmpi: require: - '@4.1.7' + # Compilers + intel-oneapi-compilers-classic: + require: + - '@2021.10.0' # Specifications that apply to all packages all: require: - - '%intel@2021.10.0' + - '%access_intel' - target=x86_64_v4 view: true concretizer: From b1b21decfd33b8ff508ba66105257616a68db1cb Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:41:07 +1100 Subject: [PATCH 06/11] [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 5dc4cbd..a1106ad 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.09.004" + "access-spack-packages": "2025.09.004", + "custom-scopes": ["ukmo-restricted-scope"] } diff --git a/spack.yaml b/spack.yaml index 4441b7e..6b92279 100644 --- a/spack.yaml +++ b/spack.yaml @@ -53,9 +53,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 c9bff8e6ee4a94c1ce661ac696d32ee8674c9864 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 20 Jan 2026 15:47:36 +1100 Subject: [PATCH 07/11] [no ci] Remove inputs.pr, updated versions in ci-comment --- .github/workflows/ci-command.yml | 11 +++++------ .github/workflows/ci.yml | 3 --- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-command.yml b/.github/workflows/ci-command.yml index b06012e..9d74435 100644 --- a/.github/workflows/ci-command.yml +++ b/.github/workflows/ci-command.yml @@ -8,12 +8,11 @@ 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 permissions: pull-requests: write @@ -23,7 +22,7 @@ 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 }} permissions: @@ -33,7 +32,7 @@ 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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9ea5b1..9e012e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,6 @@ jobs: uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: model: ${{ vars.NAME }} - 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 @@ -34,6 +33,4 @@ jobs: name: Closed if: github.event.action == 'closed' uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8 - with: - root-sbd: ${{ vars.NAME }} secrets: inherit From 3613927a0c0dd8a32c16884c4cb47a2b138f82a2 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 11 Feb 2026 09:03:19 +1100 Subject: [PATCH 08/11] [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 a1106ad..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.09.004", - "custom-scopes": ["ukmo-restricted-scope"] + "access-spack-packages": "2026.02.002", + "custom-scopes": [ + "ukmo-restricted-scope" + ] } From ae16cf5719aebb4b9e36010955c5049fff662abc Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 20 Feb 2026 09:38:38 +1100 Subject: [PATCH 09/11] TEST: Update branch to test-v8 --- .github/workflows/cd.yml | 2 +- .github/workflows/ci-command.yml | 6 +++--- .github/workflows/ci.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 02f6d49..44941f9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,7 +10,7 @@ on: jobs: cd: name: CD - uses: access-nri/build-cd/.github/workflows/cd.yml@v8 + uses: access-nri/build-cd/.github/workflows/cd.yml@test-v8 with: model: ${{ vars.NAME }} spack-manifest-schema-version: 2-0-0 diff --git a/.github/workflows/ci-command.yml b/.github/workflows/ci-command.yml index 9d74435..cf437d0 100644 --- a/.github/workflows/ci-command.yml +++ b/.github/workflows/ci-command.yml @@ -8,7 +8,7 @@ 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@v8 + uses: access-nri/build-cd/.github/workflows/ci.yml@test-v8 with: model: ${{ vars.NAME }} spack-manifest-schema-version: 2-0-0 @@ -22,7 +22,7 @@ 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@v8 + uses: access-nri/build-cd/.github/workflows/ci-comment.yml@test-v8 with: model: ${{ vars.NAME }} permissions: @@ -32,7 +32,7 @@ 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@v8 + uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@test-v8 with: model: ${{ vars.NAME }} auto-configs-pr-schema-version: 1-0-0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e012e9..17ed822 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: pr-ci: name: CI if: github.event.action != 'closed' - uses: access-nri/build-cd/.github/workflows/ci.yml@v8 + uses: access-nri/build-cd/.github/workflows/ci.yml@test-v8 with: model: ${{ vars.NAME }} spack-manifest-schema-version: 2-0-0 @@ -32,5 +32,5 @@ jobs: pr-closed: name: Closed if: github.event.action == 'closed' - uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8 + uses: access-nri/build-cd/.github/workflows/ci-closed.yml@test-v8 secrets: inherit From 78cb6bb8073ab04cdfa6d8683463550682ed04ff Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 20 Feb 2026 09:40:20 +1100 Subject: [PATCH 10/11] Update to language-based compiler restrictions --- spack.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 6b92279..a5f9054 100644 --- a/spack.yaml +++ b/spack.yaml @@ -41,14 +41,19 @@ spack: require: - '@4.1.7' # Compilers - intel-oneapi-compilers-classic: + c: require: - - '@2021.10.0' + - intel-oneapi-compilers-classic@2021.10.0 + cxx: + require: + - intel-oneapi-compilers-classic@2021.10.0 + fortran: + require: + - intel-oneapi-compilers-classic@2021.10.0 # Specifications that apply to all packages all: require: - - '%access_intel' - target=x86_64_v4 view: true concretizer: From 3894499281935b17e8a814192e6ec3901477d6fa Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 20 Mar 2026 12:23:10 +1100 Subject: [PATCH 11/11] Update access-spack-packages to 2026.03.004 (fixes fiat@um missing patch bug) --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index fea1936..3eda55f 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,7 +1,7 @@ { "$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": "2026.02.002", + "access-spack-packages": "2026.03.004", "custom-scopes": [ "ukmo-restricted-scope" ]