Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
jobs:
cd:
name: CD
uses: access-nri/build-cd/.github/workflows/cd.yml@v6
uses: access-nri/build-cd/.github/workflows/cd.yml@spack-v1-migration_TEST
with:
model: ${{ vars.NAME }}
spack-manifest-schema-version: 1-0-7
config-versions-schema-version: 3-0-0
config-versions-schema-version: 4-0-0
config-packages-schema-version: 1-0-0
permissions:
contents: write
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
name: CI
if: >-
(github.event_name == 'pull_request' && github.event.action != 'closed') || (github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
uses: access-nri/build-cd/.github/workflows/ci.yml@v6
uses: access-nri/build-cd/.github/workflows/ci.yml@spack-v1-migration_TEST
with:
model: ${{ vars.NAME }}
# root-sbd: if different from vars.NAME
pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
spack-manifest-schema-version: 1-0-7
config-versions-schema-version: 3-0-0
config-versions-schema-version: 4-0-0
config-packages-schema-version: 1-0-0
permissions:
pull-requests: write
Expand All @@ -41,7 +41,7 @@ jobs:
pr-comment:
name: Comment
if: github.event_name == 'issue_comment'
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v6
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@spack-v1-migration_TEST
with:
model: ${{ vars.NAME }}
# root-sbd: if different from vars.NAME
Expand All @@ -52,7 +52,7 @@ jobs:
pr-closed:
name: Closed
if: github.event_name == 'pull_request' && github.event.action == 'closed'
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v6
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@spack-v1-migration_TEST
with:
root-sbd: access-test
secrets: inherit
6 changes: 3 additions & 3 deletions config/versions.json
Original file line number Diff line number Diff line change
@@ -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": "main"
"$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": "api-v2"
}
7 changes: 5 additions & 2 deletions spack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is a Spack Environment file.
# This is a Spack Environment file!
#
# It describes a set of packages to be installed, along with
# configuration settings.
Expand All @@ -15,9 +15,12 @@ spack:
gcc-runtime:
require:
- '%gcc'
intel-oneapi-compilers-classic:
require:
- '@2021.10.0'
all:
require:
- '%intel@2021.10.0'
- '%access_intel'
- 'target=x86_64'
view: true
concretizer:
Expand Down
Loading