Skip to content

Commit 625366d

Browse files
committed
Get builtin-spack-packages ref from spack-config repos.yaml (#374)
1 parent bf4bbaa commit 625366d

1 file changed

Lines changed: 14 additions & 3 deletions

File tree

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
spack-version: ${{ steps.config-versions-refs.outputs.spack-branch }}
167167
spack-git-hash: ${{ steps.spack-sha.outputs.sha }}
168168

169-
builtin-spack-packages-version: ${{ steps.config-settings-refs.outputs.builtin-spack-packages-ref }}
169+
builtin-spack-packages-version: ${{ steps.builtin-spack-packages.outputs.ref }}
170170
builtin-spack-packages-git-hash: ${{ steps.builtin-spack-packages-sha.outputs.sha }}
171171

172172
access-spack-packages-version: ${{ steps.config-versions-refs.outputs.access-spack-packages-ref }}
@@ -245,7 +245,18 @@ jobs:
245245
246246
echo "spack-ref=$(jq --compact-output --raw-output '.spack' <<< "$refs_for_deployment")" >> $GITHUB_OUTPUT
247247
echo "spack-config-ref=$(jq --compact-output --raw-output '."spack-config"' <<< "$refs_for_deployment")" >> $GITHUB_OUTPUT
248-
echo "builtin-spack-packages-ref=$(jq --compact-output --raw-output '."builtin-spack-packages"' <<< "$refs_for_deployment")" >> $GITHUB_OUTPUT
248+
249+
- name: 'build-cd: Checkout spack-config to get builtin spack-packages ref'
250+
uses: actions/checkout@v4
251+
with:
252+
repository: ACCESS-NRI/spack-config
253+
ref: ${{ steps.config-settings-refs.outputs.spack-config }}
254+
path: spack-config
255+
256+
- name: 'build-cd: Get builtin spack-packages ref'
257+
id: builtin-spack-packages
258+
run: |
259+
echo "ref=$(yq '.repos | .builtin // ."builtin:" | .branch // .tag // .commit' spack-config/v${{ steps.config-versions-refs.outputs.spack-branch }}/repos.yaml)" >> $GITHUB_OUTPUT
249260
250261
- name: 'build-cd: Get spack SHA'
251262
id: spack-sha
@@ -266,7 +277,7 @@ jobs:
266277
uses: access-nri/actions/.github/actions/get-git-ref-info@main
267278
with:
268279
repository: spack/spack-packages
269-
ref: ${{ steps.config-settings-refs.outputs.builtin-spack-packages-ref }}
280+
ref: ${{ steps.builtin-spack-packages.outputs.ref }}
270281

271282
check-spack-yaml:
272283
name: '${{ inputs.deployment-target }}: Check Spack Manifest'

0 commit comments

Comments
 (0)