diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4abe3c0b..02f6d49f 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 b06012ec..9d744358 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 abef03c6..ddd7738c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,12 @@ jobs: name: CI # This job is responsible for checks and prerelease deployments # that happen when a PR is modified or opened - 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 @@ -39,7 +37,5 @@ jobs: # This job is responsible for cleaning up the Prereleases after a # PR is 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 # inherit GitHub Deployment environment secrets diff --git a/config/versions.json b/config/versions.json index ae98cfb0..ef5f3036 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { - "$schema": "http://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.08.003" + "$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 ab00b837..275a92ee 100644 --- a/spack.yaml +++ b/spack.yaml @@ -2,88 +2,100 @@ # # It describes a set of packages to be installed, along with # configuration settings. -# Instructions for editing this file are found in +# Instructions for editing this file are found in # https://github.com/ACCESS-NRI/model-deployment-template/blob/main/spack.yaml spack: + # _name and _version are reserved definitions that inform deployments + definitions: + - _name: [access-om3] + - _version: [2025.08.002] specs: - - access-om3@git.2025.08.001 + - access-om3 packages: # Main Dependencies access3: require: - - '@2025.08.000' - - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@2025.08.000' + - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3 + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' access-cice: require: - - '@CICE6.6.1-0' - - io_type=PIO - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@CICE6.6.1-0' + - io_type=PIO + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' access-mom6: require: - - '@2025.07.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@2025.07.000' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' access-ww3: require: - - '@2025.08.000' + - '@2025.08.000' access3-share: require: - - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@2025.08.000' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' access-generic-tracers: require: - - '@2025.08.000' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@2025.08.000' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' access-mocsy: require: - - '@2025.07.002' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@2025.07.002' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' # Other Dependencies esmf: require: - - '@8.7.0' - - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' - - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - '@8.7.0' + - 'fflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' + - 'cxxflags="-march=sapphirerapids -mtune=sapphirerapids -unroll"' parallelio: require: - - '@2.6.2' + - '@2.6.8' netcdf-c: require: - - '@4.9.2' - - build_system=cmake build_type=RelWithDebInfo + - '@4.9.3' + - build_system=cmake build_type=RelWithDebInfo netcdf-fortran: require: - - '@4.6.1' + - '@4.6.1' fms: require: - - '@2025.03' - - 'cppflags="-DMAXFIELDMETHODS_=600"' + - '@2025.03' + - 'cppflags="-DMAXFIELDMETHODS_=600"' openmpi: require: - - '@4.1.7' + - '@4.1.7' fortranxml: require: - - '@4.1.2' - gcc-runtime: + - '@4.1.2' + + # Compilers + 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' view: true concretizer: unify: true