diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-10-04 11:19:56 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-10-04 11:19:56 +0200 |
| commit | 1ad2452e6e5e78004cc46b95e8da7268ba14a8bc (patch) | |
| tree | 89b1a213b328004318268c83525d8a1f8733d590 | |
| parent | aefb298021f165110d96e03ea610be10df133aef (diff) | |
| download | rabbitmq-server-git-1ad2452e6e5e78004cc46b95e8da7268ba14a8bc.tar.gz | |
Fixup workflow syntax for update-* workflows
| -rw-r--r-- | .github/workflows/update-otp-for-oci.yaml | 11 | ||||
| -rw-r--r-- | .github/workflows/update-rbe-images.yaml | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/.github/workflows/update-otp-for-oci.yaml b/.github/workflows/update-otp-for-oci.yaml index 63f4521853..49d5f6ab6e 100644 --- a/.github/workflows/update-otp-for-oci.yaml +++ b/.github/workflows/update-otp-for-oci.yaml @@ -22,10 +22,11 @@ jobs: - name: SKIP IF THE PR ALREADY EXISTS id: check-for-branch run: | - c=$(git ls-remote --exit-code --heads origin bump-otp-for-oci) - echo "::set-output name=c::$c" + set +e + git ls-remote --exit-code --heads origin bump-otp-for-oci + echo "::set-output name=c::$?" - name: DETERMINE LATEST PATCH & SHA - if: steps.check-for-branch.c != 0 + if: steps.check-for-branch.outputs.c != 0 id: fetch-version run: | TAG_NAME=$(curl -s GET https://api.github.com/repos/erlang/otp/tags \ @@ -37,7 +38,7 @@ jobs: echo "::set-output name=VERSION::${TAG_NAME#OTP-}" echo "::set-output name=SHA::${SHA}" - name: MODIFY VERSION FILE - if: steps.check-for-branch.c != 0 + if: steps.check-for-branch.outputs.c != 0 run: | echo "Updating packaging/docker-image/${{ matrix.image_tag_suffix }}.yaml with:" echo " otp -> ${{ steps.fetch-version.outputs.VERSION }}" @@ -50,7 +51,7 @@ jobs: set -x git diff - name: CREATE PULL REQUEST - if: steps.check-for-branch.c != 0 + if: steps.check-for-branch.outputs.c != 0 uses: peter-evans/create-pull-request@v3 with: token: ${{ secrets.REPO_SCOPED_TOKEN }} diff --git a/.github/workflows/update-rbe-images.yaml b/.github/workflows/update-rbe-images.yaml index 9b06d62aa9..6954e5593e 100644 --- a/.github/workflows/update-rbe-images.yaml +++ b/.github/workflows/update-rbe-images.yaml @@ -25,10 +25,11 @@ jobs: - name: SKIP IF THE PR ALREADY EXISTS id: check-for-branch run: | - c=$(git ls-remote --exit-code --heads origin bump-rbe-image-${{ matrix.short_version }}) - echo "::set-output name=c::$c" + set +e + git ls-remote --exit-code --heads origin bump-rbe-image-${{ matrix.short_version }} + echo "::set-output name=c::$?" - name: UPDATE RBE IMAGE SHA - if: steps.check-for-branch.c != 0 + if: steps.check-for-branch.outputs.c != 0 env: IMAGE: pivotalrabbitmq/rabbitmq-server-buildenv TAG: linux-erlang-${{ matrix.erlang_version }} @@ -43,7 +44,7 @@ jobs: "dict_set exec_properties container-image:docker://${IMAGE}@${DIGEST}" \ //:erlang_${{ matrix.short_version }}_platform || test $? -eq 3 - name: CREATE PULL REQUEST - if: steps.check-for-branch.c != 0 + if: steps.check-for-branch.outputs.c != 0 uses: peter-evans/create-pull-request@v3 with: token: ${{ secrets.REPO_SCOPED_TOKEN }} |