diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index bd3a4ed8..02f6d49f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,12 +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 }} - 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 030d96a3..9d744358 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-esm1p6 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-esm1p6 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-esm1p6 permissions: pull-requests: write secrets: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ef15f8d..7abfac32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,13 +20,11 @@ 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 - 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 +34,5 @@ jobs: pr-closed: name: Closed if: github.event.action == 'closed' - uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v7 - with: - root-sbd: access-esm1p6 + uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8 secrets: inherit diff --git a/config/versions.json b/config/versions.json index da8528f1..fea1936e 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,8 @@ { - "$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.1", + "access-spack-packages": "2026.02.002", + "custom-scopes": [ + "ukmo-restricted-scope" + ] } diff --git a/spack.yaml b/spack.yaml index 97946956..6ef75bcc 100644 --- a/spack.yaml +++ b/spack.yaml @@ -8,76 +8,77 @@ # - 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.001] specs: - - access-esm1p6@git.2026.02.000 cice=5 + - access-esm1p6 cice=5 packages: # Coupler oasis3-mct: require: - - '@5.2' + - '@5.2' + - 'target=x86_64_v2' # 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' - # System dependencies - gcc-runtime: + - '@1.14.3' + + # Compilers + c: + require: + - 'intel-oneapi-compilers@2025.2.0' + cxx: require: - - '%gcc' - glibc: + - 'intel-oneapi-compilers@2025.2.0' + fortran: require: - - '@2.28' - - '%gcc' + - 'intel-oneapi-compilers@2025.2.0' # Preferences for all packages all: - require: - - '%oneapi@2025.2.0' - - 'target=x86_64_v4' + prefer: + - 'target=x86_64_v4' 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