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 c8c9195..7abfac3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,15 +19,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 }} - # 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 +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: ${{ 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 a6f4b3a..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": "SOME_SPECIFIC_TAG" + "$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 96be036..5f04d1b 100644 --- a/spack.yaml +++ b/spack.yaml @@ -3,25 +3,38 @@ # 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: # [DEPLOYMENT_NAME_HERE] + - _version: # [DEPLOYMENT_VERSION_HERE] specs: # The root Spack Bundle Recipe (SBR) for the model and overall version of # the deployment: - # TODO: Replace the MODEL and VERSION. - # - MODEL@git.VERSION + # TODO: Replace the MODEL. + # - MODEL packages: # Specification of dependency versions and variants. CI/CD requires that # the first element of the require is only a version: # TODO: Specify versions and variants of dependencies as required. # openmpi: # require: - # - '@4.1.5' + # - '@4.1.5' + # Compilers + # c: + # require: + # - intel-oneapi-compilers-classic@19.0.5.281 + # cxx: + # require: + # - intel-oneapi-compilers-classic@19.0.5.281 + # fortran: + # require: + # - intel-oneapi-compilers-classic@19.0.5.281 # Specifications that apply to all packages all: - # TODO: Specify compiler/targets for all packages + # TODO: Specify targets for all packages # require: - # - '%intel@19.0.5.281' - # - 'target=x86_64' + # - 'target=x86_64_v3' view: true concretizer: unify: true