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-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 c22db42..5e9feaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,12 @@ 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 @@ -35,7 +33,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: ${{ vars.NAME }} + uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8 secrets: inherit diff --git a/config/versions.json b/config/versions.json index 46074bf..ef5f303 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.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.1", + "access-spack-packages": "2026.02.002" } diff --git a/spack.yaml b/spack.yaml index dbc5861..441e055 100644 --- a/spack.yaml +++ b/spack.yaml @@ -3,51 +3,63 @@ # It describes a set of packages to be installed, along with # configuration settings. spack: + definitions: + # _name and _version are reserved definitions that inform deployments + - _name: [access-om2] + - _version: [2025.12.000] # add package specs to the `specs` list specs: - - access-om2@git.2025.12.000=latest + - access-om2 packages: + # Direct dependencies cice5: require: - - '@git.2025.03.001=access-om2' + - '@git.2025.03.001=access-om2' mom5: require: - - '@git.2025.08.000=access-om2' + - '@git.2025.08.000=access-om2' libaccessom2: require: - - '@git.2025.05.001=access-om2' + - '@git.2025.05.001=access-om2' oasis3-mct: require: - - '@git.2025.03.001' + - '@git.2025.03.001' + + # Indirect dependencies netcdf-c: require: - - '@4.9.2' + - '@4.9.2' netcdf-fortran: require: - - '@4.6.1' + - '@4.6.1' parallelio: require: - - '@2.6.2' + - '@2.6.2' openmpi: require: - - '@5.0.8' + - '@5.0.8' access-fms: require: - - '@git.mom5-2025.05.000=mom5' - - 'cppflags="-DMAXFIELDMETHODS_=600"' + - '@git.mom5-2025.05.000=mom5' + - 'cppflags="-DMAXFIELDMETHODS_=600"' access-generic-tracers: require: - - '@2025.09.000' + - '@2025.09.000' access-mocsy: require: - - '@2025.07.002' - gcc-runtime: + - '@2025.07.002' + c: require: - - '%gcc' - all: + - 'intel-oneapi-compilers@2025.2.0' + cxx: + require: + - 'intel-oneapi-compilers@2025.2.0' + fortran: require: - - '%oneapi@2025.2.0' - - 'target=x86_64_v4' + - 'intel-oneapi-compilers@2025.2.0' + all: + prefer: + - 'target=x86_64_v4' view: true concretizer: unify: true