Skip to content

Commit b301428

Browse files
CodeGatCodeGat
committed
Update all build-cd refs to dev-121-multi-target-workflows_TEST 
1 parent 23bf067 commit b301428

File tree

9 files changed

+49
-24
lines changed

9 files changed

+49
-24
lines changed

‎.github/actions/get-target-matrix/action.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ runs:
1717
uses: actions/checkout@v4
1818
with:
1919
repository: access-nri/build-cd
20+
ref: dev-121-multi-target-workflows_TEST
2021

2122
- name: Generate Deployment Target Matrix
2223
shell: bash

‎.github/workflows/cd.yml

+13-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Generate Deployment Target Matrix
5454
id: target
55-
uses: access-nri/build-cd/.github/actions/get-target-matrix@v4
55+
uses: access-nri/build-cd/.github/actions/get-target-matrix@dev-121-multi-target-workflows_TEST
5656
with:
5757
targets: ${{ vars.RELEASE_DEPLOYMENT_TARGETS }}
5858

@@ -67,9 +67,14 @@ jobs:
6767
steps:
6868
- uses: actions/checkout@v4
6969
with:
70+
<<<<<<< HEAD
7071
repository: access-nri/build-cd
72+
=======
73+
repository: ACCESS-NRI/build-cd
74+
ref: dev-121-multi-target-workflows_TEST
75+
>>>>>>> 6f857c3 (Update all `build-cd` refs to `dev-121-multi-target-workflows_TEST`)
7176

72-
- uses: access-nri/build-cd/.github/actions/validate-deployment-settings@v4
77+
- uses: access-nri/build-cd/.github/actions/validate-deployment-settings@dev-121-multi-target-workflows_TEST
7378
with:
7479
settings-path: ./config/settings.json
7580
target: ${{ matrix.target }}
@@ -120,7 +125,7 @@ jobs:
120125
strategy:
121126
matrix:
122127
target: ${{ fromJson(needs.defaults.outputs.targets) }}
123-
uses: access-nri/build-cd/.github/workflows/deploy-1-setup.yml@v4
128+
uses: access-nri/build-cd/.github/workflows/deploy-1-setup.yml@dev-121-multi-target-workflows_TEST
124129
with:
125130
deployment-target: ${{ matrix.target }}
126131
deployment-ref: ${{ github.ref_name }}
@@ -152,6 +157,7 @@ jobs:
152157
uses: actions/checkout@v4
153158
with:
154159
repository: access-nri/build-cd
160+
ref: dev-121-multi-target-workflows_TEST
155161

156162
- name: Download Metadata Artifacts
157163
uses: actions/download-artifact@v4
@@ -237,13 +243,14 @@ jobs:
237243
- name: 'Get Gadi spack-* Repo Versions'
238244
id: spack-versions
239245
run: |
240-
echo "packages-version=$(jq --raw-output --compact-output '.spack_packages_version' ${{ env.OUTPUTS_PATH }}/deploy-outputs.Gadi)" >> $GITHUB_OUTPUT
241-
echo "config-version=$(jq --raw-output --compact-output '.spack_config_version' ${{ env.OUTPUTS_PATH }}/deploy-outputs.Gadi)" >> $GITHUB_OUTPUT
246+
echo "packages-version=$(jq --raw-output --compact-output '.spack_packages_version' ${{ env.OUTPUTS_PATH }}/deploy-outputs.GadiTest)" >> $GITHUB_OUTPUT
247+
echo "config-version=$(jq --raw-output --compact-output '.spack_config_version' ${{ env.OUTPUTS_PATH }}/deploy-outputs.GadiTest)" >> $GITHUB_OUTPUT
242248
243249
- name: Checkout Upload Script
244250
uses: actions/checkout@v4
245251
with:
246252
repository: access-nri/build-cd
253+
ref: dev-121-multi-target-workflows_TEST
247254

248255
- name: Setup Python
249256
uses: actions/setup-python@v5
@@ -265,4 +272,4 @@ jobs:
265272
${{ needs.defaults.outputs.root-sbd }} ${{ vars.BUILD_DB_PACKAGES }}
266273
267274
echo "Attempting upload of build_metadata.json"
268-
python ./tools/release_provenance/save_release.py "${{ env.OUTPUTS_PATH }}/build_metadata.json"
275+
# python ./tools/release_provenance/save_release.py "${{ env.OUTPUTS_PATH }}/build_metadata.json"

‎.github/workflows/ci-closed.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Generate Deployment Target Matrix
4040
id: target
41-
uses: access-nri/build-cd/.github/actions/get-target-matrix@v4
41+
uses: access-nri/build-cd/.github/actions/get-target-matrix@dev-121-multi-target-workflows_TEST
4242
with:
4343
targets: ${{ vars.PRERELEASE_DEPLOYMENT_TARGETS }}
4444

@@ -50,7 +50,7 @@ jobs:
5050
matrix:
5151
target: ${{ fromJson(needs.setup.outputs.targets) }}
5252
fail-fast: false
53-
uses: access-nri/build-cd/.github/workflows/undeploy-1-start.yml@v4
53+
uses: access-nri/build-cd/.github/workflows/undeploy-1-start.yml@dev-121-multi-target-workflows_TEST
5454
with:
5555
version-pattern: ${{ inputs.root-sbd }}-pr${{ github.event.pull_request.number }}-*
5656
target: ${{ matrix.target }}

‎.github/workflows/ci.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
126126
- name: Generate Deployment Target Matrix
127127
id: target
128-
uses: access-nri/build-cd/.github/actions/get-target-matrix@v4
128+
uses: access-nri/build-cd/.github/actions/get-target-matrix@dev-121-multi-target-workflows_TEST
129129
with:
130130
targets: ${{ vars.PRERELEASE_DEPLOYMENT_TARGETS }}
131131

@@ -189,7 +189,7 @@ jobs:
189189
matrix:
190190
# Example: ['Gadi', 'Setonix', ...]
191191
target: ${{ fromJson(needs.defaults.outputs.targets) }}
192-
uses: access-nri/build-cd/.github/workflows/deploy-1-setup.yml@v4
192+
uses: access-nri/build-cd/.github/workflows/deploy-1-setup.yml@dev-121-multi-target-workflows_TEST
193193
with:
194194
deployment-target: ${{ matrix.target }}
195195
deployment-ref: ${{ needs.defaults.outputs.head-ref }}
@@ -249,6 +249,7 @@ jobs:
249249
uses: actions/checkout@v4
250250
with:
251251
repository: access-nri/build-cd
252+
ref: dev-121-multi-target-workflows_TEST
252253

253254
- name: Download matrix deployment outputs
254255
uses: actions/download-artifact@v4

‎.github/workflows/deploy-1-setup.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,23 @@ jobs:
121121

122122
- name: Validate spack-packages version
123123
id: spack-packages
124-
uses: access-nri/build-cd/.github/actions/validate-repo-version@v4
124+
uses: access-nri/build-cd/.github/actions/validate-repo-version@dev-121-multi-target-workflows_TEST
125125
with:
126126
repo-to-check: spack-packages
127127
pr: ${{ inputs.deployment-ref }}
128128

129129
- name: Validate spack version
130130
id: spack
131-
uses: access-nri/build-cd/.github/actions/validate-repo-version@v4
131+
uses: access-nri/build-cd/.github/actions/validate-repo-version@dev-121-multi-target-workflows_TEST
132132
with:
133133
repo-to-check: spack
134134
pr: ${{ inputs.deployment-ref }}
135135

136136
- name: Checkout build-cd Config
137137
uses: actions/checkout@v4
138138
with:
139-
repository: access-nri/build-cd
139+
repository: ACCESS-NRI/build-cd
140+
ref: dev-121-multi-target-workflows_TEST
140141
path: cd
141142

142143
- name: Get spack-config version
@@ -151,7 +152,7 @@ jobs:
151152
152153
- name: Validate build-cd config/settings.json
153154
id: settings
154-
uses: access-nri/build-cd/.github/actions/validate-deployment-settings@v4
155+
uses: access-nri/build-cd/.github/actions/validate-deployment-settings@dev-121-multi-target-workflows_TEST
155156
with:
156157
settings-path: ./cd/config/settings.json
157158
target: ${{ inputs.deployment-target }}
@@ -280,7 +281,7 @@ jobs:
280281
needs:
281282
- check-config # Verify configuration information is correct
282283
- check-spack-yaml # Verify spack manifest information is correct
283-
uses: access-nri/build-cd/.github/workflows/deploy-2-start.yml@v4
284+
uses: access-nri/build-cd/.github/workflows/deploy-2-start.yml@dev-121-multi-target-workflows_TEST
284285
with:
285286
model: ${{ inputs.spack-manifest-root-sbd }}
286287
ref: ${{ inputs.deployment-ref }}

‎.github/workflows/deploy-2-start.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
8181
- name: Get ${{ inputs.deployment-target }} ${{ inputs.deployment-type }} Remote Paths
8282
id: path
83-
uses: access-nri/build-cd/.github/actions/get-deploy-paths@v4
83+
uses: access-nri/build-cd/.github/actions/get-deploy-paths@dev-121-multi-target-workflows_TEST
8484
with:
8585
spack-installs-root-path: ${{ vars.SPACK_INSTALLS_ROOT_LOCATION }}
8686
spack-version: ${{ steps.versions.outputs.spack }}
@@ -165,11 +165,12 @@ jobs:
165165
echo "spack=${{ steps.path.outputs.spack }}" >> $GITHUB_OUTPUT
166166
echo "modules=${{ vars.DEPLOYED_MODULES_DIR }}" >> $GITHUB_OUTPUT
167167
168-
- name: Get metadata from ${{ inputs.deployment-target }} ${{ inputs.deployment-type}}
168+
- name: Get metadata from ${{ inputs.deployment-target }} ${{ inputs.deployment-type }}
169169
env:
170170
SPACK_ENV_PATH: ${{ steps.path.outputs.spack }}/../environments/${{ inputs.env-name }}
171171
run: |
172172
ssh ${{ secrets.USER }}@${{ secrets.HOST }} -i ${{ steps.ssh.outputs.private-key-path }} /bin/bash <<'EOT'
173+
173174
# Export vars.DEPLOYMENT_TARGET
174175
export DEPLOYMENT_TARGET="${{ vars.DEPLOYMENT_TARGET }}"
175176
echo "DEPLOYMENT_TARGET exported as $DEPLOYMENT_TARGET"

‎.github/workflows/undeploy-1-start.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Get ${{ inputs.target }} Remote Paths
5050
id: path
51-
uses: access-nri/build-cd/.github/actions/get-deploy-paths@v4
51+
uses: access-nri/build-cd/.github/actions/get-deploy-paths@dev-121-multi-target-workflows_TEST
5252
with:
5353
spack-installs-root-path: ${{ vars.SPACK_INSTALLS_ROOT_LOCATION }}
5454
spack-version: ${{ steps.versions.outputs.spack }}

‎config/settings.json

+14
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,20 @@
1818
"spack-config": "2024.11.27"
1919
}
2020
}
21+
},
22+
"GadiTest": {
23+
"Release": {
24+
"0.22": {
25+
"spack": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d",
26+
"spack-config": "2024.11.27"
27+
}
28+
},
29+
"Prerelease": {
30+
"0.22": {
31+
"spack": "21da7d7e2b5e2680cd9d2e0a2fb4a7d13d8baa9d",
32+
"spack-config": "2024.11.27"
33+
}
34+
}
2135
}
2236
}
2337
}

‎scripts/generate-build-metadata.bash

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spack=$(jq \
3131
'{
3232
version: .spack.version,
3333
commit: .spack.commit
34-
}' "$json_dir/Gadi.spack.lock")
34+
}' "$json_dir/GadiTest.spack.lock")
3535

3636
model=$(jq \
3737
--arg model "$model_name" \
@@ -50,7 +50,7 @@ model=$(jq \
5050
spack_config: $spack_config_version,
5151
status: "active",
5252
spack_version: $spack
53-
}' "$json_dir/Gadi.spack.lock"
53+
}' "$json_dir/GadiTest.spack.lock"
5454
)
5555

5656
# construction of the initial build_metadata.json
@@ -65,21 +65,21 @@ for pkg in "${packages[@]}"; do
6565
pkg_hash=$(jq --raw-output \
6666
--arg pkg "$pkg" \
6767
'.concrete_specs | to_entries[] | select(.value.name == $pkg) | .key' \
68-
"$json_dir/Gadi.spack.lock"
68+
"$json_dir/GadiTest.spack.lock"
6969
)
7070

7171
echo "Hash of $pkg is $pkg_hash"
7272

7373
install_path=$(jq --raw-output \
7474
--arg pkg_hash "$pkg_hash" \
7575
'to_entries[] | select(.key == $pkg_hash) | .value' \
76-
"$json_dir/Gadi.spack.location.json"
76+
"$json_dir/GadiTest.spack.location.json"
7777
)
7878

7979
release_url=$(jq --raw-output \
8080
--arg pkg "$pkg" \
8181
'.[$pkg]' \
82-
"$json_dir/Gadi.build-db-pkgs.json"
82+
"$json_dir/GadiTest.build-db-pkgs.json"
8383
)
8484

8585
component=$(jq \
@@ -92,7 +92,7 @@ for pkg in "${packages[@]}"; do
9292
spec: (.value.name + "@" + .value.version),
9393
install_path: $install_path,
9494
release_url: $release_url
95-
}' "$json_dir/Gadi.spack.lock"
95+
}' "$json_dir/GadiTest.spack.lock"
9696
)
9797

9898
# piecewise construction of the entire build_metadata.json for each

0 commit comments

Comments
 (0)