From 3f54c3c8727d8d759974e69446a4b6c185a4cf3d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 14:07:18 +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 8785207..84bf87e 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 0821d78..35b13dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,15 +19,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: if different from 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 @@ -37,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: ${{ vars.NAME }} # or something else, if different from vars.NAME secrets: inherit diff --git a/config/versions.json b/config/versions.json index adcb269..be4e482 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.08.001" + "$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.08.001" } From 5f90f0d1e694e371e4dba995564bb02de90aabd4 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:49:58 +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 be4e482..7391768 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.08.001" } From b9f25dabdd42099c6f0adbc41cf19bc7fa53eda8 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:11:09 +1100 Subject: [PATCH 03/11] [no ci] spack.yaml: Dedent list elements for spack-style manifests --- spack.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spack.yaml b/spack.yaml index de44877..0d10cfd 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,26 +4,26 @@ # configuration settings. spack: specs: - - coastri-roms@git.2025.06.000 + - coastri-roms@git.2025.06.000 packages: # Specification of dependency versions and variants. CI/CD requires that # the first element of the require is only a version ancoms-roms: require: - - '@4.2' - - roms_application='upwelling' + - '@4.2' + - roms_application='upwelling' openmpi: require: - - '@4.1.4' + - '@4.1.4' netcdf-c: require: - - '@4.7.3' + - '@4.7.3' # Specifications that apply to all packages all: require: - - '%intel@2021.8.0' - - 'target=x86_64' + - '%intel@2021.8.0' + - 'target=x86_64' view: true concretizer: unify: true From a2265cca108ef406508302a7b15822298bcf8c76 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:12:09 +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 0d10cfd..415fb0d 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: [coastri-roms] + - _version: [2025.06.000] specs: - - coastri-roms@git.2025.06.000 + - coastri-roms packages: # Specification of dependency versions and variants. CI/CD requires that # the first element of the require is only a version From 8fe806667605a09d3f865b364ded9696282b96bc Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:13:20 +1100 Subject: [PATCH 05/11] [no ci] spack.yaml: Use toolchains --- spack.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spack.yaml b/spack.yaml index 415fb0d..7e5abdd 100644 --- a/spack.yaml +++ b/spack.yaml @@ -14,7 +14,7 @@ spack: # the first element of the require is only a version ancoms-roms: require: - - '@4.2' + - '@4.2' - roms_application='upwelling' openmpi: require: @@ -22,11 +22,14 @@ spack: netcdf-c: require: - '@4.7.3' - + # Compilers + intel-oneapi-compilers: + require: + - '@2021.8.0' # Specifications that apply to all packages all: require: - - '%intel@2021.8.0' + - '%access_intel' - 'target=x86_64' view: true concretizer: From 5e9440a914eac1523a32bf8cea29a60e99d2bafc Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 20 Jan 2026 15:58:38 +1100 Subject: [PATCH 06/11] [no ci] Remove inputs.pr and inputs.root-sbd, updated versions in ci-comment --- .github/workflows/ci-command.yml | 11 +++++------ .github/workflows/ci.yml | 4 ---- 2 files changed, 5 insertions(+), 10 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 35b13dd..15be63f 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: if different from 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 @@ -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: ${{ vars.NAME }} # or something else, if different from vars.NAME secrets: inherit From f2119761a9827c0cdd278d0dbf35abba0031aa81 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 11 Feb 2026 09:03:13 +1100 Subject: [PATCH 07/11] [no ci] Update config/versions.json access-spack-packages version to common api-v2 tag --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 7391768..ef5f303 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.1", - "access-spack-packages": "2025.08.001" + "access-spack-packages": "2026.02.002" } From 2d63f3dbfe36c55d99a270904e54e8ba0582fcab Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 20 Feb 2026 11:19:40 +1100 Subject: [PATCH 08/11] Updated to language-based compiler requirements --- spack.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index 7e5abdd..aa53353 100644 --- a/spack.yaml +++ b/spack.yaml @@ -22,14 +22,21 @@ spack: netcdf-c: require: - '@4.7.3' + # Compilers - intel-oneapi-compilers: + c: require: - - '@2021.8.0' + - intel-oneapi-compilers-classic@2021.8.0 + cxx: + require: + - intel-oneapi-compilers-classic@2021.8.0 + fortran: + require: + - intel-oneapi-compilers-classic@2021.8.0 + # Specifications that apply to all packages all: - require: - - '%access_intel' + prefer: - 'target=x86_64' view: true concretizer: From 129b315d911c8cacea85f47c2b0fd456f494de1b Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 24 Feb 2026 13:35:21 +1100 Subject: [PATCH 09/11] Update compiler to intel@2021.10.0 --- spack.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack.yaml b/spack.yaml index aa53353..1bda7ce 100644 --- a/spack.yaml +++ b/spack.yaml @@ -6,7 +6,7 @@ spack: definitions: # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [coastri-roms] - - _version: [2025.06.000] + - _version: [2026.02.000] specs: - coastri-roms packages: @@ -26,13 +26,13 @@ spack: # Compilers c: require: - - intel-oneapi-compilers-classic@2021.8.0 + - intel-oneapi-compilers-classic@2021.10.0 cxx: require: - - intel-oneapi-compilers-classic@2021.8.0 + - intel-oneapi-compilers-classic@2021.10.0 fortran: require: - - intel-oneapi-compilers-classic@2021.8.0 + - intel-oneapi-compilers-classic@2021.10.0 # Specifications that apply to all packages all: From e4539c181825f5edf3ebdf0f1bec02d090856687 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 25 Feb 2026 09:36:13 +1100 Subject: [PATCH 10/11] Use +mpi explicitly --- spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack.yaml b/spack.yaml index 1bda7ce..1226343 100644 --- a/spack.yaml +++ b/spack.yaml @@ -15,6 +15,7 @@ spack: ancoms-roms: require: - '@4.2' + - '+mpi' - roms_application='upwelling' openmpi: require: From ad7209fa938c6fd05e08b4d10948ca355433867c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 3 Mar 2026 09:32:20 +1100 Subject: [PATCH 11/11] [no ci] Update openmpi from 4.1.4 to 4.1.5 as it is no longer a valid external --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 1226343..fbc0cbb 100644 --- a/spack.yaml +++ b/spack.yaml @@ -19,7 +19,7 @@ spack: - roms_application='upwelling' openmpi: require: - - '@4.1.4' + - '@4.1.5' netcdf-c: require: - '@4.7.3'