From 4e84f8e9983e367c4adb7f941bac63969c86fc2d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 14:05:27 +1100 Subject: [PATCH 01/16] [no ci] infra: Update to v8 --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 4 ++-- config/versions.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index bd3a4ed8..f7cf8f52 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@v7 + uses: access-nri/build-cd/.github/workflows/cd.yml@v8 with: model: ${{ vars.NAME }} root-sbd: access-esm1p6 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ef15f8d..c7f98363 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@v7 + uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: model: ${{ vars.NAME }} root-sbd: access-esm1p6 @@ -36,7 +36,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-esm1p6 secrets: inherit diff --git a/config/versions.json b/config/versions.json index da8528f1..9bce0958 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": "2026.02.000" + "$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.11.001" } From 938481296eb1dafbcd96add4ca3aeb9980d4370a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:49:30 +1100 Subject: [PATCH 02/16] [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 9bce0958..10b254eb 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.11.001" } From bdca3fdeb88d0748d3f2d1a37a175be364274ad1 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 14:23:29 +1100 Subject: [PATCH 03/16] [no ci] spack.yaml: Dedent list elements for spack-style manifests --- spack.yaml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/spack.yaml b/spack.yaml index 97946956..559ceb2c 100644 --- a/spack.yaml +++ b/spack.yaml @@ -9,69 +9,69 @@ # - CICE5 spack: specs: - - access-esm1p6@git.2026.02.000 cice=5 + - access-esm1p6@git.2026.02.000 cice=5 packages: # Coupler oasis3-mct: require: - - '@5.2' + - '@5.2' # Major components cice5: require: - - '@2026.01.000' - - 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size + - '@2026.01.000' + - 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size um7: require: - - '@git.2026.02.000=access-esm1.6' + - '@git.2026.02.000=access-esm1.6' cable: require: - - '@2025.11.000' - - library=access-esm1.6 + - '@2025.11.000' + - library=access-esm1.6 mom5: require: - - '@git.2025.05.000=access-esm1.6' + - '@git.2025.05.000=access-esm1.6' # Model dependencies # MOM5 access-fms: require: - - '@git.mom5-2025.08.000=mom5' + - '@git.mom5-2025.08.000=mom5' access-generic-tracers: require: - - '@2025.09.000' + - '@2025.09.000' access-mocsy: require: - - '@2025.07.002' + - '@2025.07.002' # UM7 gcom4: require: - - '@git.2025.08.000=access-esm1.5' + - '@git.2025.08.000=access-esm1.5' # Shared dependencies openmpi: require: - - '@5.0.8' + - '@5.0.8' netcdf-c: require: - - '@4.9.2' + - '@4.9.2' netcdf-fortran: require: - - '@4.6.1' + - '@4.6.1' hdf5: require: - - '@1.14.3' + - '@1.14.3' # System dependencies gcc-runtime: require: - - '%gcc' + - '%gcc' glibc: require: - - '@2.28' - - '%gcc' + - '@2.28' + - '%gcc' # Preferences for all packages all: require: - - '%oneapi@2025.2.0' - - 'target=x86_64_v4' + - '%oneapi@2025.2.0' + - 'target=x86_64_v4' view: true concretizer: unify: true From beeb3f8fbcdb9024c3254d527392025679b70080 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 14:42:48 +1100 Subject: [PATCH 04/16] [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 559ceb2c..3091a58f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -8,8 +8,12 @@ # - MOM5 from master branch with access-generic-tracers (wombatlite) as a library # - CICE5 spack: + definitions: + # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise + - _name: [access-esm1p6] + - _version: [2026.02.000] specs: - - access-esm1p6@git.2026.02.000 cice=5 + - access-esm1p6 cice=5 packages: # Coupler oasis3-mct: From 7f078a507818fe71cb2fc107519f4af18977ad52 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 15:15:59 +1100 Subject: [PATCH 05/16] [no ci] spack.yaml: Remove spack.config key --- spack.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spack.yaml b/spack.yaml index 3091a58f..f6b2ba8b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -79,9 +79,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 b2c658f87a344c068541cdffeb707504725d77c3 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 15:32:57 +1100 Subject: [PATCH 06/16] [no ci] versions.json: Add ukmo-restricted-scope to custom-scopes --- config/versions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 10b254eb..ad47d492 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.11.001" + "access-spack-packages": "2025.11.001", + "custom-scopes": ["ukmo-restricted-scope"] } From 85b5564a4b832cce55e11e0130d79af08fc15df0 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 15:38:03 +1100 Subject: [PATCH 07/16] [no ci] spack.yaml: Use toolchains --- spack.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index f6b2ba8b..274ef807 100644 --- a/spack.yaml +++ b/spack.yaml @@ -65,16 +65,21 @@ spack: # System dependencies gcc-runtime: require: - - '%gcc' + - '%access_gcc' glibc: require: - '@2.28' - - '%gcc' + - '%access_gcc' + + # Compilers + intel-oneapi-compilers: + require: + - '@2025.2.0' # Preferences for all packages all: require: - - '%oneapi@2025.2.0' + - '%access_oneapi' - 'target=x86_64_v4' view: true concretizer: From 975bbdc11904a89bfae7be01d9b75d8c0ab10b8c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 5 Jan 2026 16:30:45 +1100 Subject: [PATCH 08/16] [no ci] Update schema versions --- .github/workflows/ci-command.yml | 10 +++++----- .github/workflows/ci.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-command.yml b/.github/workflows/ci-command.yml index 030d96a3..9b98317d 100644 --- a/.github/workflows/ci-command.yml +++ b/.github/workflows/ci-command.yml @@ -8,12 +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-esm1p6 permissions: @@ -24,7 +24,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 }} root-sbd: access-esm1p6 @@ -35,7 +35,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 c7f98363..6ee6760f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,8 @@ jobs: model: ${{ vars.NAME }} root-sbd: access-esm1p6 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 From 7e74534aec388f1aed7564155ac57bff43693c0a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 20 Jan 2026 15:44:39 +1100 Subject: [PATCH 09/16] [no ci] Remove inputs.pr and inputs.root-sbd, updated schema versions --- .github/workflows/cd.yml | 5 ++--- .github/workflows/ci-command.yml | 4 ---- .github/workflows/ci.yml | 4 ---- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f7cf8f52..02f6d49f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -13,9 +13,8 @@ jobs: uses: access-nri/build-cd/.github/workflows/cd.yml@v8 with: model: ${{ vars.NAME }} - root-sbd: access-esm1p6 - 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-command.yml b/.github/workflows/ci-command.yml index 9b98317d..9d744358 100644 --- a/.github/workflows/ci-command.yml +++ b/.github/workflows/ci-command.yml @@ -11,11 +11,9 @@ jobs: uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: model: ${{ vars.NAME }} - pr: ${{ github.event.issue.number }} spack-manifest-schema-version: 2-0-0 config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 - root-sbd: access-esm1p6 permissions: pull-requests: write contents: write @@ -27,7 +25,6 @@ jobs: uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v8 with: model: ${{ vars.NAME }} - root-sbd: access-esm1p6 permissions: pull-requests: write contents: write @@ -39,7 +36,6 @@ jobs: with: model: ${{ vars.NAME }} auto-configs-pr-schema-version: 1-0-0 - root-sbd: access-esm1p6 permissions: pull-requests: write secrets: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ee6760f..7abfac32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,6 @@ jobs: uses: access-nri/build-cd/.github/workflows/ci.yml@v8 with: model: ${{ vars.NAME }} - root-sbd: access-esm1p6 - 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 @@ -37,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: access-esm1p6 secrets: inherit From 6a16a6c44bb6d75d6a69ba2ee7a15c94b9e4bf99 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 11 Feb 2026 09:02:59 +1100 Subject: [PATCH 10/16] [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 ad47d492..fea1936e 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.11.001", - "custom-scopes": ["ukmo-restricted-scope"] + "access-spack-packages": "2026.02.002", + "custom-scopes": [ + "ukmo-restricted-scope" + ] } From 32d52b994b70fcab9c3c24292bd74cec9af99844 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Feb 2026 11:32:17 +1100 Subject: [PATCH 11/16] Update language constraints to be in line with current format, remove glibc constraints --- spack.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/spack.yaml b/spack.yaml index 274ef807..3a27e546 100644 --- a/spack.yaml +++ b/spack.yaml @@ -62,24 +62,21 @@ spack: hdf5: require: - '@1.14.3' - # System dependencies - gcc-runtime: - require: - - '%access_gcc' - glibc: - require: - - '@2.28' - - '%access_gcc' # Compilers - intel-oneapi-compilers: + c: + require: + - 'intel-oneapi-compilers@2025.2.0' + cxx: require: - - '@2025.2.0' + - 'intel-oneapi-compilers@2025.2.0' + fortran: + require: + - 'intel-oneapi-compilers@2025.2.0' # Preferences for all packages all: - require: - - '%access_oneapi' + prefer: - 'target=x86_64_v4' view: true concretizer: From efa19579d44bb87e4d679ff0441561dd3bab6788 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Feb 2026 16:17:29 +1100 Subject: [PATCH 12/16] TEST: Rerun after metadata fix in ACCESS-NRI/build-cd#357 From f28f8daa5cc493b29d5946f5d3f94c840ba55df2 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 12 Feb 2026 16:24:39 +1100 Subject: [PATCH 13/16] TEST: After updating the test branch From 60e3d49fee88bde4ff42be4baf7e2120d777dc9d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 18 Feb 2026 11:34:37 +1100 Subject: [PATCH 14/16] TEST: Redeploy after modulefile issues From 6b2308ead14e8ccf295b981ef6b2655b22ce24dd Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Tue, 3 Mar 2026 09:33:36 +1100 Subject: [PATCH 15/16] [no ci] Set oasis3-mct target=x86_64_v2 for reproducibility --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index 3a27e546..b197d56e 100644 --- a/spack.yaml +++ b/spack.yaml @@ -19,6 +19,7 @@ spack: oasis3-mct: require: - '@5.2' + - 'target=x86_64_v2' # Major components cice5: require: From a6cdc348e1305d0cba1efaa8a6ebc05a93589ca2 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 3 Mar 2026 10:50:01 +1100 Subject: [PATCH 16/16] [no ci] Update version to 2026.02.001 for deployment --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index b197d56e..6ef75bcc 100644 --- a/spack.yaml +++ b/spack.yaml @@ -11,7 +11,7 @@ spack: definitions: # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [access-esm1p6] - - _version: [2026.02.000] + - _version: [2026.02.001] specs: - access-esm1p6 cice=5 packages: