Skip to content

Commit

Permalink
ci: fix GHA pointed by actionlint
Browse files Browse the repository at this point in the history
  • Loading branch information
eitsupi committed Apr 24, 2024
1 parent 42772bd commit 127ded4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
all-versions: ${{ steps.set-json.outputs.all-versions }}
steps:
- uses: actions/[email protected]
- id: set-json
Expand Down Expand Up @@ -76,7 +77,8 @@ jobs:
call-extra-workflow:
needs:
- generate_matrix
- build
uses: ./.github/workflows/extra.yml
with:
all-versions: ${{ steps.set-json.outputs.all-versions == 'true' }}
all-versions: ${{ needs.generate_matrix.outputs.all-versions }}
4 changes: 2 additions & 2 deletions .github/workflows/extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ jobs:
JSON="build/matrix/latest-two.json"
fi
if [[ -n "{{ inputs.group }}" ]]; then
CONTENT="$(jq -s -r '.[0] + { group: [.[1].group[] | keys[] | select(. != "default")] } | tostring' ${{ steps.set-json.outputs.json }} build/templates/bakefiles/extra.docker-bake.json)"
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' ${{ steps.set-json.outputs.json }})"
CONTENT="$(jq -r '.group = ["${{ inputs.group }}"] | tostring' $JSON)"
fi
echo "matrix=${CONTENT}" >>"$GITHUB_OUTPUT"
echo "${CONTENT}"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ jobs:
generate_matrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
matrix-main: ${{ steps.set-matrix.outputs.matrix-main }}
matrix-extra: ${{ steps.set-matrix.outputs.matrix-extra }}
steps:
- uses: actions/[email protected]
- id: set-matrix
Expand Down

0 comments on commit 127ded4

Please sign in to comment.