Skip to content

Commit

Permalink
ci: fix GHA definition for building extra images (#807)
Browse files Browse the repository at this point in the history
  • Loading branch information
eitsupi authored May 7, 2024
2 parents 24a64fa + 5723340 commit 511ffd0
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ on:
type: string
required: false

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true
# TODO: reconsider <https://github.com/github/vscode-github-actions/issues/135>
# concurrency:
# group: ${{ github.workflow }}
# cancel-in-progress: true

jobs:
generate_matrix:
Expand All @@ -39,7 +40,7 @@ jobs:
if [[ "${{ inputs.all-versions }}" == "true" ]]; then
JSON="build/matrix/latest-two.json"
fi
if [[ -n "${{ inputs.group }}" ]]; then
if [[ -z "${{ inputs.group }}" ]]; then
CONTENT="$(jq -s -r '.[0] + { group: [.[1].group[] | keys[] | select(. != "default")] } | tostring' $JSON build/templates/bakefiles/extra.docker-bake.json)"
else
CONTENT="$(jq -r '.group = ["${{ inputs.group }}"] | tostring' $JSON)"
Expand Down

0 comments on commit 511ffd0

Please sign in to comment.