From 2c9fb6b949e418abc3732215d3c411419df4827e Mon Sep 17 00:00:00 2001 From: Callum Loh Date: Thu, 1 Sep 2022 18:19:42 +0100 Subject: [PATCH] Move collecting modified images to script so can set pipefail --- .github/scripts/fetch-modified-images.sh | 17 +++++++++++++++++ .github/workflows/image-rebuild.yaml | 14 +------------- .github/workflows/pr-validate.yaml | 14 +------------- 3 files changed, 19 insertions(+), 26 deletions(-) create mode 100755 .github/scripts/fetch-modified-images.sh diff --git a/.github/scripts/fetch-modified-images.sh b/.github/scripts/fetch-modified-images.sh new file mode 100755 index 0000000..c08acbf --- /dev/null +++ b/.github/scripts/fetch-modified-images.sh @@ -0,0 +1,17 @@ +# Gets changed images from GIT + +set -euo pipefail + + +declare -a changes_array=() +while read -r app +do + while read -r channel + do + change="$(jo app="$app" channel="$channel")" + changes_array+=($change) + done < <(jq --raw-output -c '.channels[] | .name' "./apps/$app/metadata.json") +done < <(echo '${{ needs.pr-metadata.outputs.addedOrModifiedImages }}' | jq --raw-output -c '.[]') + +output="$(jo -a ${changes_array[*]})" +echo "::set-output name=changes::${output}" diff --git a/.github/workflows/image-rebuild.yaml b/.github/workflows/image-rebuild.yaml index 9d07d7c..85e6bf3 100644 --- a/.github/workflows/image-rebuild.yaml +++ b/.github/workflows/image-rebuild.yaml @@ -44,19 +44,7 @@ jobs: - name: Fetch modified images id: get-changed shell: bash - run: | - declare -a changes_array=() - while read -r app - do - while read -r channel - do - change="$(jo app="$app" channel="$channel")" - changes_array+=($change) - done < <(jq -r '.channels[] | .name' "./apps/$app/metadata.json") - done < <(echo '${{ needs.get-changes.outputs.addedOrModifiedImages }}' | jq --raw-output -c '.[]') - - output="$(jo -a ${changes_array[*]})" - echo "::set-output name=changes::${output}" + run: ./.github/scripts/fetch-modified-images.sh images-build: uses: cdloh/containers/.github/workflows/action-image-build.yaml@main diff --git a/.github/workflows/pr-validate.yaml b/.github/workflows/pr-validate.yaml index ebf017a..6b938f7 100644 --- a/.github/workflows/pr-validate.yaml +++ b/.github/workflows/pr-validate.yaml @@ -34,19 +34,7 @@ jobs: - name: Fetch modified images id: get-changed shell: bash - run: | - declare -a changes_array=() - while read -r app - do - while read -r channel - do - change="$(jo app="$app" channel="$channel")" - changes_array+=($change) - done < <(jq --raw-output -c '.channels[] | .name' "./apps/$app/metadata.json") - done < <(echo '${{ needs.pr-metadata.outputs.addedOrModifiedImages }}' | jq --raw-output -c '.[]') - - output="$(jo -a ${changes_array[*]})" - echo "::set-output name=changes::${output}" + run: ./.github/scripts/fetch-modified-images.sh images-build: uses: cdloh/containers/.github/workflows/action-image-build.yaml@main