Update the automation to bump erlang/elixir patches in CI

so that the workflow fails if the branch already exists, instead of
just skipping

We had a period of many weeks where the elixir workflow was being
skipped because the branch was left around after a PR was closed, so
we want to avoid that in the future

2 files changed, 21 insertions, 19 deletions

diff --git a/.github/workflows/update-elixir-patches.yaml b/.github/workflows/update-elixir-patches.yaml
index f3b653fd7e..4e4bd7fa4d 100644
--- a/.github/workflows/update-elixir-patches.yaml
+++ b/.github/workflows/update-elixir-patches.yaml
@@ -17,17 +17,20 @@ jobs:
         - elixir_version: "1.14"
           name: '1_14'
     timeout-minutes: 10
+    env:
+      branch: bump-elixir-${{ matrix.elixir_version }}
     steps:
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v3
-    - name: SKIP IF THE PR ALREADY EXISTS
+    - name: FAIL IF THE PR ALREADY EXISTS
       id: check-for-branch
       run: |
         set +e
-        git ls-remote --exit-code --heads origin bump-elixir-${{ matrix.elixir_version }}
-        echo "::set-output name=c::$?"
+        if git ls-remote --exit-code --heads origin ${{ env.branch }}; then
+          echo "Branch ${{ env.branch }} already exits"
+          exit 1
+        fi
     - name: DETERMINE LATEST PATCH & SHA
-      if: steps.check-for-branch.outputs.c != 0
       id: fetch-version
       run: |
         TAG_NAME=$(curl -s GET https://api.github.com/repos/elixir-lang/elixir/tags?per_page=100 \
@@ -47,10 +50,9 @@ jobs:
           exit 1
         fi
 
-        echo "::set-output name=VERSION::${TAG_NAME#v}"
-        echo "::set-output name=SHA::${SHA}"
+        echo "VERSION=${TAG_NAME#v}" >> $GITHUB_OUTPUT
+        echo "SHA=${SHA}" >> $GITHUB_OUTPUT
     - name: MODIFY VERSION FILE
-      if: steps.check-for-branch.outputs.c != 0
       run: |
         sudo npm install --global --silent @bazel/buildozer
 
@@ -67,7 +69,6 @@ jobs:
         set -x
         git diff
     - name: CREATE PULL REQUEST
-      if: steps.check-for-branch.outputs.c != 0
       uses: peter-evans/create-pull-request@v5.0.0
       with:
         token: ${{ secrets.REPO_SCOPED_TOKEN }}
@@ -85,5 +86,5 @@ jobs:
           backport-v3.12.x
           backport-v3.11.x
           backport-v3.10.x
-        branch: bump-elixir-${{ matrix.elixir_version }}
+        branch: ${{ env.branch }}
         delete-branch: true
diff --git a/.github/workflows/update-otp-patches.yaml b/.github/workflows/update-otp-patches.yaml
index fcd9b5a46d..345c84aa94 100644
--- a/.github/workflows/update-otp-patches.yaml
+++ b/.github/workflows/update-otp-patches.yaml
@@ -50,19 +50,22 @@ jobs:
             backport-v3.11.x
             backport-v3.10.x
     timeout-minutes: 10
+    env:
+      branch: bump-otp-${{ matrix.erlang_version }}
     steps:
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v3
       with:
         ref: ${{ matrix.branch }}
-    - name: SKIP IF THE PR ALREADY EXISTS
+    - name: FAIL IF THE PR ALREADY EXISTS
       id: check-for-branch
       run: |
         set +e
-        git ls-remote --exit-code --heads origin bump-otp-${{ matrix.erlang_version }}
-        echo "::set-output name=c::$?"
+        if git ls-remote --exit-code --heads origin ${{ env.branch }}; then
+          echo "Branch ${{ env.branch }} already exits"
+          exit 1
+        fi
     - name: DETERMINE LATEST PATCH & SHA
-      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?per_page=100 \
@@ -92,11 +95,10 @@ jobs:
           exit 1
         fi
 
-        echo "::set-output name=VERSION::${VERSION}"
-        echo "::set-output name=SHA::${SHA}"
-        echo "::set-output name=SHA2::${SHA2}"
+        echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+        echo "SHA=${SHA}" >> $GITHUB_OUTPUT
+        echo "SHA2=${SHA2}" >> $GITHUB_OUTPUT
     - name: MODIFY VERSION FILE
-      if: steps.check-for-branch.outputs.c != 0
       run: |
         sudo npm install --global --silent @bazel/buildozer
 
@@ -143,7 +145,6 @@ jobs:
         set -x
         git diff
     - name: CREATE PULL REQUEST
-      if: steps.check-for-branch.outputs.c != 0
       uses: peter-evans/create-pull-request@v5.0.0
       with:
         token: ${{ secrets.REPO_SCOPED_TOKEN }}
@@ -158,5 +159,5 @@ jobs:
         commit-message: |
           Adopt otp ${{ steps.fetch-version.outputs.VERSION }}
         labels: ${{ matrix.labels }}
-        branch: bump-otp-${{ matrix.erlang_version }}
+        branch: ${{ env.branch }}
         delete-branch: true