From 5aa8d03a59f3a2624d483316cccea7df02126a3c Mon Sep 17 00:00:00 2001
From: Bert Blommers <bblommers@users.noreply.github.com>
Date: Sun, 21 Mar 2021 10:18:53 +0000
Subject: [PATCH] Admin - Use GraphQL to find PR, instead of commit msg (#3792)

---
 .github/workflows/build.yml | 36 +++++++++++++++++++++++++++++++++---
 update_version_from_git.py  |  2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 648e11e27..cea68ebd0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -193,10 +193,39 @@ jobs:
         run: |
           version=$(grep -oP '(?<=__version__ = ")[0-9.a-z]+(?=")' moto/__init__.py)
           echo "moto_version=$version" >> $GITHUB_ENV
+      - uses: octokit/graphql-action@v2.x
+        name: Get PR info
+        id: get_pr
+        with:
+          query: |
+            query get_pr($owner:String!,$repo:String!,$commit:GitObjectID) {
+              repository(owner:$owner,name:$repo) {
+                object(oid:$commit) {
+                  ... on Commit {
+                    associatedPullRequests(last: 1){
+                      edges {
+                        node {
+                          baseRepository {
+                            nameWithOwner
+                          }
+                          merged
+                          number
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          owner: ${{ github.event.repository.owner.name }}
+          repo: ${{ github.event.repository.name }}
+          commit: "${{ github.sha }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get PR number
         run: |
-          msg="${{ github.event.commits[0].message }}"
-          nr=$(grep -oP '\(#\K[0-9]+' <<< "$msg" | head -n 1)
+          nr="${{ fromJSON(steps.get_pr.outputs.data).repository.object.associatedPullRequests.edges[0].node.number }}"
+          repo="${{ fromJSON(steps.get_pr.outputs.data).repository.object.associatedPullRequests.edges[0].node.baseRepository.nameWithOwner }}"
           if [ -z "$nr" ]
           then
             echo "PR nr not found in $msg"
@@ -204,11 +233,12 @@ jobs:
           else
             echo "PR NR: $nr"
             echo "pr_nr=$nr" >> $GITHUB_ENV
+            echo "pr_repo=$repo" >> $GITHUB_ENV
             echo "pr_found=true" >> $GITHUB_ENV
           fi
       - name: Leave PR comment with Moto version
         uses: peter-evans/create-or-update-comment@v1
-        if: env.pr_found == 'true'
+        if: env.pr_found == 'true' && env.pr_repo == 'spulec/moto'
         with:
           issue-number: ${{ env.pr_nr }}
           body: |
diff --git a/update_version_from_git.py b/update_version_from_git.py
index 8ed2411b7..84b909d50 100644
--- a/update_version_from_git.py
+++ b/update_version_from_git.py
@@ -95,7 +95,7 @@ def prerelease_version():
     assert (
         initpy_ver > ver
     ), "the moto/__init__.py version should be newer than the last tagged release."
-    return "{initpy_ver}.{commits_since}".format(
+    return "{initpy_ver}{commits_since}".format(
         initpy_ver=initpy_ver, commits_since=commits_since
     )