Skip to content

Commit

Permalink
Updated SPACK_YAML_MODEL_YQ to be specs instead of spec
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeGat committed Mar 15, 2024
1 parent f701755 commit ec5d584
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:
paths:
- config/**
- spack.yaml

env:
SPACK_YAML_MODEL_YQ: .spack.specs[0]
jobs:
generate-tag:
name: Generate Tag Name
Expand All @@ -27,7 +28,7 @@ jobs:
# The `cut` command splits the `access-om2@git.<version>` field into just `<version>`,
# which will be the new tag.
run: |
access_om2_package=$(yq e '.spack.specs[0]' spack.yaml)
access_om2_package=$(yq e '${{ env.SPACK_YAML_MODEL_YQ }}' spack.yaml)
echo "name=${access_om2_package/*@git./}" >> $GITHUB_OUTPUT
undeploy-prereleases:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- config/**
- spack.yaml
env:
SPACK_YAML_MODEL_YQ: .spack.spec[0]
SPACK_YAML_MODEL_YQ: .spack.specs[0]
jobs:
# There are a lot of interconnected jobs here. Here is a dependency diagram:
# validate-json ──> check-json ─────────┬─────────────────────────┐
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- edited
env:
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
SPACK_YAML_MODEL_YQ: .spack.spec[0]
SPACK_YAML_MODEL_YQ: .spack.specs[0]
SPACK_YAML_MODEL_PROJECTION_YQ: .spack.modules.default.tcl.projections.access-om2
jobs:
bump-version:
Expand Down

0 comments on commit ec5d584

Please sign in to comment.