Skip to content

Commit 5ea74af

Browse files
authored
[skip ci] infra: Update to v6 (#9)
1 parent e2f0c18 commit 5ea74af

5 files changed

Lines changed: 29 additions & 45 deletions

File tree

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Tommy needs to review changes to infra
2+
/.github/ @CodeGat
3+

.github/workflows/cd.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ on:
1010
jobs:
1111
cd:
1212
name: CD
13-
uses: access-nri/build-cd/.github/workflows/cd.yml@v5
13+
uses: access-nri/build-cd/.github/workflows/cd.yml@v6
1414
with:
1515
model: ${{ vars.NAME }}
16+
spack-manifest-schema-version: 1-0-7
17+
config-versions-schema-version: 3-0-0
18+
config-packages-schema-version: 1-0-0
1619
permissions:
1720
contents: write
1821
# Required because later workflows also handle on.pull_request trigger

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,35 @@ jobs:
2424
pr-ci:
2525
name: CI
2626
if: >-
27-
(github.event_name == 'pull_request' && github.event.action != 'closed') ||
28-
(github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
29-
uses: access-nri/build-cd/.github/workflows/ci.yml@v5
27+
(github.event_name == 'pull_request' && github.event.action != 'closed') || (github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
28+
uses: access-nri/build-cd/.github/workflows/ci.yml@v6
3029
with:
3130
model: ${{ vars.NAME }}
3231
# root-sbd: if different from vars.NAME
3332
pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
33+
spack-manifest-schema-version: 1-0-7
34+
config-versions-schema-version: 3-0-0
35+
config-packages-schema-version: 1-0-0
3436
permissions:
3537
pull-requests: write
3638
contents: write
3739
statuses: write
3840
secrets: inherit
39-
4041
pr-comment:
4142
name: Comment
4243
if: github.event_name == 'issue_comment'
43-
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v5
44+
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v6
4445
with:
4546
model: ${{ vars.NAME }}
4647
# root-sbd: if different from vars.NAME
4748
permissions:
4849
pull-requests: write
4950
contents: write
5051
secrets: inherit
51-
5252
pr-closed:
5353
name: Closed
5454
if: github.event_name == 'pull_request' && github.event.action == 'closed'
55-
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v5
55+
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v6
5656
with:
5757
root-sbd: ${{ vars.NAME }}
5858
secrets: inherit

config/packages.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/packages/1-0-0.json",
3+
"provenance": [],
4+
"injection": [
5+
"openmpi"
6+
]
7+
}

spack.yaml

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
# configuration settings.
55
spack:
66
specs:
7-
# The root Spack Bundle Recipe (SBR) for the model and overall version of
8-
# the deployment:
9-
# TODO: Replace the MODEL and VERSION.
10-
# - MODEL@git.VERSION
11-
7+
# The root Spack Bundle Recipe (SBR) for the model and overall version of
8+
# the deployment:
9+
# TODO: Replace the MODEL and VERSION.
10+
# - MODEL@git.VERSION
1211
packages:
1312
# Specification of dependency versions and variants. CI/CD requires that
1413
# the first element of the require is only a version:
@@ -19,38 +18,10 @@ spack:
1918

2019
# Specifications that apply to all packages
2120
all:
22-
# TODO: Specify compiler/targets for all packages
23-
# require:
24-
# - '%intel@19.0.5.281'
25-
# - 'target=x86_64'
21+
# TODO: Specify compiler/targets for all packages
22+
# require:
23+
# - '%intel@19.0.5.281'
24+
# - 'target=x86_64'
2625
view: true
2726
concretizer:
2827
unify: true
29-
modules:
30-
default:
31-
tcl:
32-
include:
33-
# TODO: Add MODEL and PACKAGEs that will have a corresponding module
34-
# - MODEL
35-
# - PACKAGE1
36-
# - PACKAGE2
37-
projections:
38-
# These projection VERSIONs must be the same as the
39-
# `spack.packages.*.require[0]` VERSION but without the `@git.` and
40-
# without the RHS of the equals sign, if there is one.
41-
#
42-
# For a MODEL, an example projection is `{name}/2024.10.0`.
43-
# For a PACKAGE where `require` VERSION is
44-
# `@git.2024.04.21=access-esm1.5`, the projection becomes
45-
# `{name}/2024.04.21-{hash:7}`.
46-
# TODO: Add explicit projections for modules that will be found with
47-
# `module load`.
48-
# MODEL: '{name}/VERSION'
49-
# PACKAGE1: '{name}/VERSION1-{hash:7}'
50-
# PACKAGE2: '{name}/VERSION2-{hash:7}'
51-
# config:
52-
# overridden spack configurations, if needed
53-
# mirrors:
54-
# overridden spack package tarball directories, if needed
55-
# repos:
56-
# overridden repo sources, if needed

0 commit comments

Comments
 (0)