From b7adc2181ff7b62259d330376630e0adf82d912f Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 14:09:06 +1100 Subject: [PATCH 01/18] [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 0f50c2f..529e36f 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 58ae233..543285a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,16 +19,15 @@ 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: pr: ${{ github.event.pull_request.number }} model: ${{ vars.NAME }} # root-sbd: if different from 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: pull-requests: write @@ -38,7 +37,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 9de4bde..07e8b71 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.07.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.07.006" } From ba263b0c85f9960fb4012453571a2a2cb6993d3e Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:50:45 +1100 Subject: [PATCH 02/18] [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 07e8b71..1638f47 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.07.006" } From 9ff4fa570a009b4f6a3d7e64f5acb589019b27b4 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:49:09 +1100 Subject: [PATCH 03/18] [no ci] spack.yaml: Dedent list elements for spack-style manifests --- spack.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/spack.yaml b/spack.yaml index 61edeb6..c547ef0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,42 +4,42 @@ # configuration settings. spack: specs: - - access-ram3@git.2025.08.000 + - access-ram3@git.2025.08.000 packages: # Direct dependencies um: require: - - '@13.5' - - model="vn13p5-rns" - - ~DR_HOOK - - +eccodes + - '@13.5' + - model="vn13p5-rns" + - ~DR_HOOK + - +eccodes # Indirect dependencies eccodes: require: - - '@2.34.0' - - '+memfs' + - '@2.34.0' + - '+memfs' 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: - - '@8.3' + - '@8.3' 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 224ac39b0f1ac7484fdd63d9483098ec2f52205d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:49:57 +1100 Subject: [PATCH 04/18] [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 c547ef0..4065ef3 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-ram3] + - _version: [2025.08.000] specs: - - access-ram3@git.2025.08.000 + - access-ram3 packages: # Direct dependencies um: From 9a6052a401f5757a94c9a1428ef611250e30309b Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:51:27 +1100 Subject: [PATCH 05/18] [no ci] spack.yaml: Use toolchains --- spack.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 4065ef3..c9b79b5 100644 --- a/spack.yaml +++ b/spack.yaml @@ -39,10 +39,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 15bb1dfac787f008188e1190631b37eac3619e76 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:52:18 +1100 Subject: [PATCH 06/18] [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 1638f47..d19314b 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.07.006" + "access-spack-packages": "2025.07.006", + "custom-scopes": ["ukmo-restricted-scope"] } diff --git a/spack.yaml b/spack.yaml index c9b79b5..210175c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -60,9 +60,3 @@ spack: environment: set: 'SPACK_{name}_ROOT': '{prefix}' - config: - install_tree: - root: $spack/../restricted/ukmo/release - source_cache: $spack/../restricted/ukmo/source_cache - build_stage: - - $TMPDIR/restricted/spack-stage From 02c24fb781cd52576bc78eb316b9a9455be1563c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 20 Jan 2026 16:01:07 +1100 Subject: [PATCH 07/18] [no ci] Remove inputs.pr and inputs.root-sbd, updated versions in ci-comment --- .github/workflows/ci-command.yml | 11 +++++------ .github/workflows/ci.yml | 5 ----- 2 files changed, 5 insertions(+), 11 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 543285a..7abfac3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,7 @@ jobs: if: github.event.action != 'closed' uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: - pr: ${{ github.event.pull_request.number }} model: ${{ vars.NAME }} - # root-sbd: if different from vars.NAME - spack-manifest-schema-version: 2-0-0 config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 @@ -38,6 +35,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 5333b4ed826d7fc1b30cd2b2a703d0328b8d490c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 11 Feb 2026 09:03:02 +1100 Subject: [PATCH 08/18] [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 d19314b..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.07.006", - "custom-scopes": ["ukmo-restricted-scope"] + "access-spack-packages": "2026.02.002", + "custom-scopes": [ + "ukmo-restricted-scope" + ] } From 9e8d8640b08fbe72e3fec7d381c83f3f0e608aba Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 19 Feb 2026 14:21:09 +1100 Subject: [PATCH 09/18] [no ci] TEST: Update to test-v8 branch --- .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 529e36f..364c4f9 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 7abfac3..b6fa0f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,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 @@ -34,5 +34,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 26c053c48c8ba5221c3abd8106f15769baa89b31 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 19 Feb 2026 14:22:57 +1100 Subject: [PATCH 10/18] Update compiler restrictions to language restrictions --- spack.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/spack.yaml b/spack.yaml index 210175c..c5134af 100644 --- a/spack.yaml +++ b/spack.yaml @@ -40,14 +40,18 @@ 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' + prefer: - target=x86_64_v4 view: true concretizer: From 0f33705020ddce3c860608660c17d6e2f3970555 Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Fri, 27 Feb 2026 13:05:40 +1100 Subject: [PATCH 11/18] Depend on DR_HOOK --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index c5134af..e1d8643 100644 --- a/spack.yaml +++ b/spack.yaml @@ -15,7 +15,7 @@ spack: require: - '@13.5' - model="vn13p5-rns" - - ~DR_HOOK + - +DR_HOOK - +eccodes # Indirect dependencies eccodes: From a2d3ce200e74c77a7a2cafba9349b513be0f40d8 Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Fri, 27 Feb 2026 14:33:01 +1100 Subject: [PATCH 12/18] Empty commit From 7e9a9be336f692eab9f65cd32a361b46c2d02b81 Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Fri, 27 Feb 2026 14:38:01 +1100 Subject: [PATCH 13/18] Another empty commit From 4d77f83a11603d0105bfb71dd9c3a256a9224604 Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Fri, 27 Feb 2026 15:25:27 +1100 Subject: [PATCH 14/18] Update gcom version in spack.yaml to use a specific commit See https://github.com/ACCESS-NRI/access-spack-packages/commit/4d188611aa79e7c5d8cd9f8945bd93c1c52186bf --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index e1d8643..d58b463 100644 --- a/spack.yaml +++ b/spack.yaml @@ -35,7 +35,7 @@ spack: - 'site=nci-gadi' gcom: require: - - '@8.3' + - '@4d188611aa79e7c5d8cd9f8945bd93c1c52186bf' openmpi: require: - '@4.1.7' From 37380ebb9765dea97cfc5ae93f6371d55050372d Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Fri, 27 Feb 2026 15:39:52 +1100 Subject: [PATCH 15/18] Temporary change to trigger redeploy --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index d58b463..22b13ab 100644 --- a/spack.yaml +++ b/spack.yaml @@ -36,6 +36,7 @@ spack: gcom: require: - '@4d188611aa79e7c5d8cd9f8945bd93c1c52186bf' + # Temporary change to trigger redeploy openmpi: require: - '@4.1.7' From 7d79e757dab8b8fb7c3640ba5c4622fa1128a53e Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Mon, 2 Mar 2026 11:38:06 +1100 Subject: [PATCH 16/18] Bump access-spack-packages to the correct gcom --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index fea1936..64e2136 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.02.004", "custom-scopes": [ "ukmo-restricted-scope" ] From 4a0cc7bfc8308b7ab6760636fbc1ff42a00d4fa5 Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Mon, 2 Mar 2026 15:39:52 +1100 Subject: [PATCH 17/18] Temporariliy use a Git hash for access-spack-packages --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 64e2136..2ddcb16 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.004", + "access-spack-packages": "a8e7d8a5c82b68de2afc3646ffc48aae256bee12", "custom-scopes": [ "ukmo-restricted-scope" ] From 7b8fab547e3aa792937932c0cfd25a1c5ac198ce Mon Sep 17 00:00:00 2001 From: Paul Leopardi Date: Mon, 2 Mar 2026 16:55:59 +1100 Subject: [PATCH 18/18] Correct gcom version --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 22b13ab..7ed3aa6 100644 --- a/spack.yaml +++ b/spack.yaml @@ -35,7 +35,7 @@ spack: - 'site=nci-gadi' gcom: require: - - '@4d188611aa79e7c5d8cd9f8945bd93c1c52186bf' + - '@8.3' # Temporary change to trigger redeploy openmpi: require: