Skip to content

Commit 4bd15a4

Browse files
authored
[skip ci] infra: Update to v6 (#39)
1 parent b98e777 commit 4bd15a4

5 files changed

Lines changed: 26 additions & 21 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,10 +10,13 @@ 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 }}
1616
root-sbd: access-esm1p5
17+
spack-manifest-schema-version: 1-0-7
18+
config-versions-schema-version: 3-0-0
19+
config-packages-schema-version: 1-0-0
1720
permissions:
1821
contents: write
1922
# 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
@@ -23,35 +23,35 @@ jobs:
2323
pr-ci:
2424
name: CI
2525
if: >-
26-
(github.event_name == 'pull_request' && github.event.action != 'closed') ||
27-
(github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
28-
uses: access-nri/build-cd/.github/workflows/ci.yml@v5
26+
(github.event_name == 'pull_request' && github.event.action != 'closed') || (github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
27+
uses: access-nri/build-cd/.github/workflows/ci.yml@v6
2928
with:
3029
model: ${{ vars.NAME }}
3130
root-sbd: access-esm1p5
3231
pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
32+
spack-manifest-schema-version: 1-0-7
33+
config-versions-schema-version: 3-0-0
34+
config-packages-schema-version: 1-0-0
3335
permissions:
3436
pull-requests: write
3537
contents: write
3638
statuses: write
3739
secrets: inherit
38-
3940
pr-comment:
4041
name: Comment
4142
if: github.event_name == 'issue_comment'
42-
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v5
43+
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v6
4344
with:
4445
model: ${{ vars.NAME }}
4546
root-sbd: access-esm1p5
4647
permissions:
4748
pull-requests: write
4849
contents: write
4950
secrets: inherit
50-
5151
pr-closed:
5252
name: Closed
5353
if: github.event_name == 'pull_request' && github.event.action == 'closed'
54-
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v5
54+
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v6
5555
with:
5656
root-sbd: access-esm1p5
5757
secrets: inherit

config/packages.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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+
"cice4",
5+
"um7",
6+
"mom5",
7+
"oasis3-mct"
8+
],
9+
"injection": [
10+
"openmpi"
11+
]
12+
}

spack.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,6 @@ spack:
4747
view: true
4848
concretizer:
4949
unify: true
50-
modules:
51-
default:
52-
tcl:
53-
include:
54-
- access-esm1p5
55-
- cice4
56-
- um7
57-
- mom5
58-
projections:
59-
access-esm1p5: '{name}/2024.12.1'
60-
cice4: '{name}/access-esm1.5-2025.04.001-{hash:7}'
61-
um7: '{name}/2024.10.17-{hash:7}'
62-
mom5: '{name}/access-esm1.5-2025.03.002-{hash:7}'
6350
config:
6451
install_tree:
6552
root: $spack/../restricted/ukmo/release

0 commit comments

Comments
 (0)