Checking merged twice

CatChen · Aug 12, 2022 · bde2582 · bde2582
1 parent e5db97b
commit bde2582
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 18 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/index.js b/lib/index.js
diff --git a/src/index.ts b/src/index.ts
@@ -29,15 +29,17 @@ async function run(): Promise<void> {
   const pullRequestNumber = (context.payload.pull_request as PullRequest)
     .number;
 
-  const merged = await checkIfPullRequestMerged(
-    owner,
-    repo,
-    pullRequestNumber,
-    octokit
-  );
-  if (merged) {
-    error(`This Pull Request has been merged already.`);
-    return;
+  {
+    const merged = await checkIfPullRequestMerged(
+      owner,
+      repo,
+      pullRequestNumber,
+      octokit
+    );
+    if (merged) {
+      error(`This Pull Request has been merged already.`);
+      return;
+    }
   }
 
   const pullRequest = await getPullRequest(
@@ -193,6 +195,19 @@ async function run(): Promise<void> {
     }
   }
 
+  {
+    const merged = await checkIfPullRequestMerged(
+      owner,
+      repo,
+      pullRequestNumber,
+      octokit
+    );
+    if (merged) {
+      error(`This Pull Request has been merged already.`);
+      return;
+    }
+  }
+
   await mergePullRequest(owner, repo, pullRequestNumber, octokit);
 }