From d422021ea2ad3666360e7b5638e24f69fa5098c0 Mon Sep 17 00:00:00 2001 From: Max Winterstein Date: Fri, 6 Oct 2023 12:09:56 +0200 Subject: [PATCH] Update onpr_check-pr.yaml (#209) * Update onpr_check-pr.yaml * Update onpr_check-pr.yaml --- .github/workflows/onpr_check-pr.yaml | 47 ++++++++++++++++++---------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/.github/workflows/onpr_check-pr.yaml b/.github/workflows/onpr_check-pr.yaml index fccb323..d027741 100644 --- a/.github/workflows/onpr_check-pr.yaml +++ b/.github/workflows/onpr_check-pr.yaml @@ -76,7 +76,6 @@ jobs: if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} runs-on: ubuntu-latest needs: check-addon-changes - continue-on-error: true strategy: fail-fast: false matrix: @@ -123,11 +122,16 @@ jobs: imagetemplate=${{ steps.information.outputs.image }} version=${{ steps.information.outputs.version }} echo "Using imagetemplate '$imagetemplate'" - echo "::set-output name=armhf::${imagetemplate/\{arch\}/armhf}:${version}" - echo "::set-output name=armv7::${imagetemplate/\{arch\}/armv7}:${version}" - echo "::set-output name=aarch64::${imagetemplate/\{arch\}/aarch64}:${version}" - echo "::set-output name=amd64::${imagetemplate/\{arch\}/amd64}:${version}" - echo "::set-output name=i386::${imagetemplate/\{arch\}/i386}:${version}" + # shellcheck disable=SC2129 + echo "armhf=${imagetemplate/\{arch\}/armhf}:${version}" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "armv7=${imagetemplate/\{arch\}/armv7}:${version}" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "aarch64=${imagetemplate/\{arch\}/aarch64}:${version}" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "amd64=${imagetemplate/\{arch\}/amd64}:${version}" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "i386=${imagetemplate/\{arch\}/i386}:${version}" >> "$GITHUB_OUTPUT" - name: 🏷️ Create addon labels id: labels shell: bash @@ -158,20 +162,31 @@ jobs: aarch64_labels="${aarch64_labels//$'\n'/'%0A'}" amd64_labels="${amd64_labels//$'\n'/'%0A'}" i386_labels="${i386_labels//$'\n'/'%0A'}" - echo "::set-output name=armhf::$armhf_labels" - echo "::set-output name=armv7::$armv7_labels" - echo "::set-output name=aarch64::$aarch64_labels" - echo "::set-output name=amd64::$amd64_labels" - echo "::set-output name=i386::$i386_labels" + # shellcheck disable=SC2129 + echo "armhf=$armhf_labels" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "armv7=$armv7_labels" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "aarch64=$aarch64_labels" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "amd64=$amd64_labels" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "i386=$i386_labels" >> "$GITHUB_OUTPUT" - name: 💽 Create addon build-args id: build_args shell: bash run: | - echo "::set-output name=armhf::BUILD_FROM=$(jq -r '.build_from.armhf // empty' ${{ steps.information.outputs.build }})" - echo "::set-output name=armv7::BUILD_FROM=$(jq -r '.build_from.armv7 // empty' ${{ steps.information.outputs.build }})" - echo "::set-output name=aarch64::BUILD_FROM=$(jq -r '.build_from.aarch64 // empty' ${{ steps.information.outputs.build }})" - echo "::set-output name=amd64::BUILD_FROM=$(jq -r '.build_from.amd64 // empty' ${{ steps.information.outputs.build }})" - echo "::set-output name=i386::BUILD_FROM=$(jq -r '.build_from.i386 // empty' ${{ steps.information.outputs.build }})" + # shellcheck disable=SC2129 + echo "armhf=BUILD_FROM=$(jq -r .build_from.armhf // empty ${{ steps.information.outputs.build }})" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "armv7=BUILD_FROM=$(jq -r .build_from.armv7 // empty ${{ steps.information.outputs.build }})" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "aarch64=BUILD_FROM=$(jq -r .build_from.aarch64 // empty ${{ steps.information.outputs.build }})" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "amd64=BUILD_FROM=$(jq -r .build_from.amd64 // empty ${{ steps.information.outputs.build }})" >> "$GITHUB_OUTPUT" + # shellcheck disable=SC2129 + echo "i386=BUILD_FROM=$(jq -r .build_from.i386 // empty ${{ steps.information.outputs.build }})" >> "$GITHUB_OUTPUT" + - name: 🏗️ Set up QEMU uses: docker/setup-qemu-action@v3