accept-to-ship-action 0.4.0 → 0.4.1

package/lib/getCheckRuns.d.ts

@@ -9,7 +9,7 @@ export declare function getCheckRuns(owner: string, repo: string, ref: string, o
     html_url: string | null;
     details_url: string | null;
     status: "completed" | "queued" | "in_progress";
-    conclusion: "success" | "neutral" | "skipped" | "failure" | "cancelled" | "timed_out" | "action_required" | null;
+    conclusion: "skipped" | "success" | "neutral" | "failure" | "cancelled" | "timed_out" | "action_required" | null;
     started_at: string | null;
     completed_at: string | null;
     output: {

package/lib/index.js

@@ -213,7 +213,6 @@ function handlePullRequest(pullRequestNumber) {
         const mergeMethod = (0, getMergeMethod_1.getMergeMethod)();
         (0, core_1.info)(`Merging with merge method: ${mergeMethod}`);
         yield (0, mergePullRequest_1.mergePullRequest)(owner, repo, pullRequestNumber, mergeMethod, octokit);
-        (0, core_1.setOutput)('skipped', false);
     });
 }
 function run() {

package/lib/mergePullRequest.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergePullRequest = exports.checkIfPullRequestMerged = void 0;
+const core_1 = require("@actions/core");
 const request_error_1 = require("@octokit/request-error");
 function checkIfPullRequestMerged(owner, repo, pullRequestNumber, octokit) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -20,34 +21,54 @@ function checkIfPullRequestMerged(owner, repo, pullRequestNumber, octokit) {
                 repo,
                 pull_number: pullRequestNumber,
             });
+            if (response.status === 204) {
+                return true;
+            }
+            else {
+                return false;
+            }
         }
         catch (error) {
             if (error instanceof request_error_1.RequestError) {
-                response = error.response;
+                if (error.status === 204) {
+                    return true;
+                }
+                else if (error.status === 404) {
+                    return false;
+                }
+                else {
+                    throw new Error(`Failed to check if pull request is merged: [${error.status}] ${error.message}`);
+                }
+            }
+            else {
+                throw error;
             }
-        }
-        if ((response === null || response === void 0 ? void 0 : response.status) === 204) {
-            return true;
-        }
-        else if ((response === null || response === void 0 ? void 0 : response.status) === 404) {
-            return false;
-        }
-        else {
-            throw new Error(`Failed to check if pull request is merged: ${response === null || response === void 0 ? void 0 : response.status}`);
         }
     });
 }
 exports.checkIfPullRequestMerged = checkIfPullRequestMerged;
 function mergePullRequest(owner, repo, pullRequestNumber, mergeMethod, octokit) {
     return __awaiter(this, void 0, void 0, function* () {
-        const response = yield octokit.rest.pulls.merge({
-            owner,
-            repo,
-            pull_number: pullRequestNumber,
-            merge_method: mergeMethod,
-        });
-        if (response.status !== 200) {
-            throw new Error(`Failed to merge pull request: ${response.status}`);
+        try {
+            yield octokit.rest.pulls.merge({
+                owner,
+                repo,
+                pull_number: pullRequestNumber,
+                merge_method: mergeMethod,
+            });
+            (0, core_1.setOutput)('skipped', false);
+        }
+        catch (error) {
+            if (error instanceof request_error_1.RequestError) {
+                (0, core_1.warning)(`Failed to merge pull request: [${error.status}] ${error.message}`);
+                // If it's merged by someone else in a race condition we treat it as skipped,
+                // because it's the same as someone else merged it before we try.
+                const merged = yield checkIfPullRequestMerged(owner, repo, pullRequestNumber, octokit);
+                (0, core_1.setOutput)('skipped', !merged);
+            }
+            else {
+                throw error;
+            }
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accept-to-ship-action",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.js",