fix: better logic for determining if the run was triggered by a relea…

…se pr
agrc · Jul 10, 2024 · 8193c5c · 8193c5c
1 parent 9736328
commit 8193c5c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,6 +2,7 @@
   "cSpell.words": [
     "agrc",
     "automerge",
+    "autorelease",
     "Pelka",
     "Radovan",
     "tibdex",

diff --git a/action.yml b/action.yml
@@ -65,20 +65,33 @@ runs:
 
     - name: 🤔 Is this a release PR merge
       id: is-release-pr
-      shell: bash
-      run: |
-        latest_commit_message=$(git log -1 --pretty=format:%s)
-        if [[ "${{ inputs.prerelease }}" == "true" ]]; then
-          pattern="chore: release v[0-9]\+\.[0-9]\+\.[0-9]\+-[0-9]\+$"
-        else
-          pattern="chore: release v[0-9]\+\.[0-9]\+\.[0-9]\+$"
-        fi
-        if echo $latest_commit_message | grep -q "$pattern"; then
-          echo "this workflow was triggered by a release PR"
-          echo "result=yes" >> $GITHUB_OUTPUT
-        else
-          echo "this workflow was not triggered by a release PR"
-        fi
+      uses: actions/github-script@v6
+      with:
+        result-encoding: string
+        retries: 3
+        script: |
+          const response = (
+            await github.rest.repos.listPullRequestsAssociatedWithCommit({
+              commit_sha: context.sha,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+          );
+
+          for (const pullRequest of response.data) {
+            if (
+              pullRequest.base.ref === context.ref.replace('refs/heads/', '') &&
+              pullRequest.state === 'closed' &&
+              pullRequest.labels.some(label => label.name === 'autorelease: pending')
+            ) {
+              console.log('this workflow was triggered by a release PR');
+
+              return 'yes';
+            }
+          }
+
+          console.log('this workflow was *not* triggered by a release PR');
+          return 'no';
 
     - name: ⏩ Get next version
       if: ${{ !env.ACT }}
@@ -113,7 +126,7 @@ runs:
 
     - name: 🚀 Create release PR
       id: create-release-pr
-      if: ${{ !steps.is-release-pr.outputs.result }}
+      if: ${{ steps.is-release-pr.outputs.result == 'no' }}
       shell: bash
       run: |
         node release-please/build/src/bin/release-please.js release-pr \
@@ -129,7 +142,7 @@ runs:
 
     - name: 🚀 Create GitHub release
       id: create-github-release
-      if: ${{ steps.is-release-pr.outputs.result }}
+      if: ${{ steps.is-release-pr.outputs.result == 'yes' }}
       shell: bash
       run: |
         node release-please/build/src/bin/release-please.js github-release \
@@ -149,7 +162,7 @@ runs:
 
     - name: 🏷️ Tag major and minor versions
       shell: bash
-      if: ${{ inputs.create-major-minor-tags == 'true' && steps.is-release-pr.outputs.result && inputs.prerelease != 'true' }}
+      if: ${{ inputs.create-major-minor-tags == 'true' && steps.is-release-pr.outputs.result == 'yes' && inputs.prerelease != 'true' }}
       run: |
         major="${{ steps.get-next-version.outputs.major || steps.mock-get-next-version.outputs.major }}"
         minor="${{ steps.get-next-version.outputs.minor || steps.mock-get-next-version.outputs.minor }}"