Skip to content

Commit 5a11db8

Browse files
authored
[skip ci] infra: Update to v6 (#5)
1 parent afb5934 commit 5a11db8

5 files changed

Lines changed: 30 additions & 50 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
secrets: inherit

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@ jobs:
2222
pr-ci:
2323
name: CI
2424
if: >-
25-
(github.event_name == 'pull_request' && github.event.action != 'closed') ||
26-
(github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
27-
uses: access-nri/build-cd/.github/workflows/ci.yml@v5
25+
(github.event_name == 'pull_request' && github.event.action != 'closed') || (github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
26+
uses: access-nri/build-cd/.github/workflows/ci.yml@v6
2827
with:
2928
model: ${{ vars.NAME }}
3029
pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
30+
spack-manifest-schema-version: 1-0-7
31+
config-versions-schema-version: 3-0-0
32+
config-packages-schema-version: 1-0-0
3133
permissions:
3234
pull-requests: write
3335
contents: write
3436
statuses: write
3537
secrets: inherit
36-
3738
pr-comment:
3839
name: Comment
3940
if: github.event_name == 'issue_comment'
40-
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v5
41+
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v6
4142
with:
4243
model: ${{ vars.NAME }}
4344
permissions:
4445
pull-requests: write
4546
contents: write
4647
secrets: inherit
47-
4848
pr-closed:
4949
name: Closed
5050
if: github.event_name == 'pull_request' && github.event.action == 'closed'
51-
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v5
51+
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v6
5252
with:
5353
root-sbd: ${{ vars.NAME }}
5454
secrets: inherit

config/packages.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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+
"um"
5+
],
6+
"injection": [
7+
"openmpi"
8+
]
9+
}

spack.yaml

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# configuration settings.
55
spack:
66
specs:
7-
# TODO: Replace the MODEL and VERSION.
8-
# The root SBD for the model and overall version of the deployment:
9-
# - MODEL@git.VERSION
7+
# TODO: Replace the MODEL and VERSION.
8+
# The root SBD for the model and overall version of the deployment:
9+
# - MODEL@git.VERSION
1010
packages:
1111
# TODO: Specify versions and variants of dependencies where required
1212
# Specification of dependency versions and variants goes here.
@@ -17,45 +17,10 @@ spack:
1717

1818
# Specifications that apply to all packages
1919
all:
20-
# TODO: Specify compiler/targets for all packages
21-
# require:
22-
# - '%intel@19.0.5.281'
23-
# - 'target=x86_64'
20+
# TODO: Specify compiler/targets for all packages
21+
# require:
22+
# - '%intel@19.0.5.281'
23+
# - 'target=x86_64'
2424
view: true
2525
concretizer:
2626
unify: true
27-
modules:
28-
default:
29-
enable:
30-
- tcl
31-
roots:
32-
tcl: $spack/../release/modules
33-
lmod: $spack/../release/lmod
34-
tcl:
35-
hash_length: 0
36-
include:
37-
# Explicitly, which packages are accessible as modules
38-
# TODO: Add packages that will be included as modules
39-
# - MODEL
40-
exclude_implicits: true
41-
all:
42-
autoload: direct
43-
conflict:
44-
- '{name}'
45-
environment:
46-
set:
47-
'SPACK_{name}_ROOT': '{prefix}'
48-
projections:
49-
# TODO: Add explicit projections for modules that will be found with `module load`.
50-
# Naming scheme for the above included modules.
51-
# These projection versions must be the same as the
52-
# `spack.packages.*.require[0]` version but without the `@git.`.
53-
# Ex. `require` version `@git.2024.04.21` -> projection `2024.04.21`.
54-
all: '{name}/{version}'
55-
# MODEL: '{name}/VERSION'
56-
# config:
57-
# overridden spack configurations, if needed
58-
# mirrors:
59-
# overridden spack package tarball directories, if needed
60-
# repos:
61-
# overridden repo sources, if needed

0 commit comments

Comments
 (0)