accept-to-ship-action 0.6.7 → 0.7.0

package/README.md

@@ -57,7 +57,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: CatChen/accept-to-ship-action@v0.3
+      - uses: CatChen/accept-to-ship-action@v0.7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }} # optional
           merge-method: merge # optional
@@ -65,7 +65,8 @@ jobs:
           checks-watch-interval: 10 # optional
           fail-if-timeout: false # optional
           request-zero-accept-zero: false # optional
-          custom-hashtag: '#accept2ship' #optional
+          custom-hashtag: '#accept2ship' # optional
+          use-auto-merge: false # optional
 
   pass-to-ship:
     name: Pass to Ship
@@ -82,7 +83,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: CatChen/accept-to-ship-action@v0.3
+      - uses: CatChen/accept-to-ship-action@v0.7
         with:
           request-zero-accept-zero: true
           custom-hashtag: '#pass2ship'
@@ -118,6 +119,16 @@ Change `#accept2ship` to another hashtag. Use multiple instances of this Action
 
 When this option is set to `true` this Action will not wait for any approval if no review was requested. Otherwise, this Action will wait for at least one approval if no review was requested. It's useful to set this to `true` with a different hashtag set in `custom-hashtag` to merge certain Pull Requests after running and passing all the checks. See the `#pass2ship` configuration in the examples from above. The default value is `false`.
 
+### `use-auto-merge`
+
+When this option is set to `true` this Action will try to use GitHub's auto-merge after the Pull Request receives the necessary approvals. Otherwise, this Action will wait for the Pull Request's checks and merge the Pull Request when the checks pass.
+
+Auto-merge is only available when:
+
+1. Auto-merge is [enabled for the repo](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository).
+2. The base branch of the Pull Request is a [protected branch](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches) or protected by [rulesets](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets).
+3. At least one of the branch protection conditions isn't met. (When all conditions are met the Pull Request is mergeable and the auto-merge is no longer available.)
+
 ## FAQ
 
 ### Where do I need to put the `#accept2ship` hashtag?

package/dist/canRepoAutoMerge.d.ts

@@ -0,0 +1,3 @@
+import type { Octokit } from '@octokit/core';
+import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
+export declare function canRepoAutoMerge(owner: string, repo: string, octokit: Octokit & Api): Promise<boolean>;

package/dist/canRepoAutoMerge.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canRepoAutoMerge = canRepoAutoMerge;
+function canRepoAutoMerge(owner, repo, octokit) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { repository: { autoMergeAllowed }, } = yield octokit.graphql(`
+      query($owner: String!, $repo: String!) {
+        repository(owner: $owner, name: $repo) {
+          autoMergeAllowed
+        }
+      }
+    `, {
+            owner,
+            repo,
+        });
+        return autoMergeAllowed;
+    });
+}

package/dist/enablePullRequestAutoMerge.d.ts

@@ -0,0 +1,5 @@
+import type { Octokit } from '@octokit/core';
+import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
+import { PullRequest } from '@octokit/webhooks-types/schema';
+import { getMergeMethod } from './getMergeMethod';
+export declare function enablePullRequestAutoMerge(owner: string, repo: string, pullRequest: PullRequest, pullRequestId: string, mergeMethod: ReturnType<typeof getMergeMethod>, octokit: Octokit & Api): Promise<void>;

package/dist/enablePullRequestAutoMerge.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enablePullRequestAutoMerge = enablePullRequestAutoMerge;
+const core_1 = require("@actions/core");
+const github_1 = require("@actions/github");
+const request_error_1 = require("@octokit/request-error");
+const isPullRequestMerged_1 = require("./isPullRequestMerged");
+function enablePullRequestAutoMerge(owner, repo, pullRequest, pullRequestId, mergeMethod, octokit) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const pullRequestNumber = pullRequest.number;
+        try {
+            yield octokit.graphql(`
+        mutation($pullRequestId: ID!, $mergeMethod: PullRequestMergeMethod) {
+          enablePullRequestAutoMerge(input: { pullRequestId: $pullRequestId, mergeMethod: $mergeMethod }) {
+            clientMutationId
+          }
+        }
+      `, {
+                pullRequestId,
+                mergeMethod: mergeMethod.toUpperCase(),
+            });
+            (0, core_1.setOutput)('skipped', false);
+            try {
+                (0, core_1.info)(`Run ID: ${github_1.context.runId}`);
+                const { data: job } = yield octokit.rest.actions.getWorkflowRun({
+                    owner,
+                    repo,
+                    run_id: github_1.context.runId,
+                });
+                (0, core_1.info)(`Job ID: ${job.id} (${job.html_url})`);
+                const { data: comment } = yield octokit.rest.issues.createComment({
+                    owner,
+                    repo,
+                    issue_number: pullRequestNumber,
+                    body: `Auto-merge is enabled by a [GitHub Action](${job.html_url})`,
+                });
+                (0, core_1.info)(`Comment is created: ${comment.html_url}`);
+            }
+            catch (requestError) {
+                if (requestError instanceof request_error_1.RequestError) {
+                    (0, core_1.info)(`Failed to comment on the Pull Request: [${requestError.status}] ${requestError.message}`);
+                }
+            }
+        }
+        catch (requestError) {
+            if (requestError instanceof request_error_1.RequestError) {
+                (0, core_1.warning)(`Failed to enable auto-merge for the Pull Request: [${requestError.status}] ${requestError.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 (0, isPullRequestMerged_1.isPullRequestMerged)(owner, repo, pullRequestNumber, octokit);
+                (0, core_1.setOutput)('skipped', !merged);
+                if (merged) {
+                    try {
+                        const { data: pullRequest } = yield octokit.rest.pulls.get({
+                            owner,
+                            repo,
+                            pull_number: pullRequestNumber,
+                        });
+                        (0, core_1.warning)(`This Pull Request has been merged by: ${(_a = pullRequest.merged_by) === null || _a === void 0 ? void 0 : _a.login} (${(_b = pullRequest.merged_by) === null || _b === void 0 ? void 0 : _b.html_url})`);
+                    }
+                    catch (_c) {
+                        (0, core_1.warning)(`This Pull Request has been merged by unknown user.`);
+                    }
+                }
+                else {
+                    // If it's not merged by someone else in a race condition then we treat it as a real error.
+                    (0, core_1.error)(`This Pull Request remains unmerged.`);
+                    (0, core_1.setFailed)(`Failed to merge this Pull Request when conditions are met.`);
+                }
+            }
+            else {
+                throw requestError;
+            }
+        }
+    });
+}

package/dist/getOcktokit.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOctokit = getOctokit;
+const core_1 = require("@actions/core");
 const utils_js_1 = require("@actions/github/lib/utils.js");
 const plugin_retry_1 = require("@octokit/plugin-retry");
 const plugin_throttling_1 = require("@octokit/plugin-throttling");
@@ -10,27 +11,27 @@ function getOctokit(githubToken) {
         throttle: {
             onRateLimit: (retryAfter, options, _, retryCount) => {
                 if (retryCount === 0) {
-                    octokit.log.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
-                    octokit.log.info(`Retrying after ${retryAfter} seconds!`);
+                    (0, core_1.warning)(`Request quota exhausted for request ${options.method} ${options.url}`);
+                    (0, core_1.info)(`Retrying after ${retryAfter} seconds!`);
                     return true;
                 }
                 else {
-                    octokit.log.error(`Request quota exhausted for request ${options.method} ${options.url}`);
+                    (0, core_1.error)(`Request quota exhausted for request ${options.method} ${options.url}`);
                 }
             },
             onSecondaryRateLimit: (retryAfter, options, _, retryCount) => {
                 if (retryCount === 0) {
-                    octokit.log.warn(`Abuse detected for request ${options.method} ${options.url}`);
-                    octokit.log.info(`Retrying after ${retryAfter} seconds!`);
+                    (0, core_1.warning)(`Abuse detected for request ${options.method} ${options.url}`);
+                    (0, core_1.info)(`Retrying after ${retryAfter} seconds!`);
                     return true;
                 }
                 else {
-                    octokit.log.warn(`Abuse detected for request ${options.method} ${options.url}`);
+                    (0, core_1.warning)(`Abuse detected for request ${options.method} ${options.url}`);
                 }
             },
         },
         retry: {
-            doNotRetry: ['429'],
+            doNotRetry: ['403', '429'],
         },
     }));
     octokit.graphql = octokit.graphql.defaults({

package/dist/getPullRequest.d.ts

@@ -1,4 +1,4 @@
 import type { Octokit } from '@octokit/core';
 import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
-import type { PullRequest } from '@octokit/webhooks-definitions/schema';
+import type { PullRequest } from '@octokit/webhooks-types/schema';
 export declare function getPullRequest(owner: string, repo: string, pullRequestNumber: number, octokit: Octokit & Api): Promise<PullRequest>;

package/dist/getPullRequestAutoMergeable.d.ts

@@ -0,0 +1,7 @@
+import type { Octokit } from '@octokit/core';
+import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
+import { PullRequest } from '@octokit/webhooks-types/schema';
+export declare function getPullRequestAutoMergeable(owner: string, repo: string, pullRequest: PullRequest, octokit: Octokit & Api): Promise<{
+    pullRequestId: string;
+    viewerCanEnableAutoMerge: boolean;
+}>;

package/dist/getPullRequestAutoMergeable.js

@@ -0,0 +1,35 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPullRequestAutoMergeable = getPullRequestAutoMergeable;
+function getPullRequestAutoMergeable(owner, repo, pullRequest, octokit) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const pullRequestNumber = pullRequest.number;
+        const { repository: { pullRequest: { pullRequestId, viewerCanEnableAutoMerge }, }, } = yield octokit.graphql(`
+        query($owner: String!, $repo: String!, $pullRequestNumber: Int!) {
+          repository(owner: $owner, name: $repo) {
+            pullRequest(number: $pullRequestNumber) {
+              pullRequestId: id
+              viewerCanEnableAutoMerge
+            }
+          }
+        }
+      `, {
+            owner,
+            repo,
+            pullRequestNumber,
+        });
+        return {
+            pullRequestId,
+            viewerCanEnableAutoMerge,
+        };
+    });
+}

package/dist/index.js

@@ -12,14 +12,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_perf_hooks_1 = require("node:perf_hooks");
 const core_1 = require("@actions/core");
 const github_1 = require("@actions/github");
+const canRepoAutoMerge_1 = require("./canRepoAutoMerge");
+const enablePullRequestAutoMerge_1 = require("./enablePullRequestAutoMerge");
 const getCheckRuns_1 = require("./getCheckRuns");
 const getMergeMethod_1 = require("./getMergeMethod");
 const getOcktokit_1 = require("./getOcktokit");
 const getPullRequest_1 = require("./getPullRequest");
+const getPullRequestAutoMergeable_1 = require("./getPullRequestAutoMergeable");
 const getPullRequestComments_1 = require("./getPullRequestComments");
 const getPullRequestReviewRequests_1 = require("./getPullRequestReviewRequests");
 const getPullRequestReviews_1 = require("./getPullRequestReviews");
 const getWorkflowRunJobs_1 = require("./getWorkflowRunJobs");
+const isPullRequestMerged_1 = require("./isPullRequestMerged");
 const mergePullRequest_1 = require("./mergePullRequest");
 const sleep_1 = require("./sleep");
 const APPROVED = 'APPROVED';
@@ -42,7 +46,7 @@ function handlePullRequest(pullRequestNumber) {
         const octokit = (0, getOcktokit_1.getOctokit)(githubToken);
         const owner = github_1.context.repo.owner;
         const repo = github_1.context.repo.repo;
-        const mergedBeforeValidations = yield (0, mergePullRequest_1.checkIfPullRequestMerged)(owner, repo, pullRequestNumber, octokit);
+        const mergedBeforeValidations = yield (0, isPullRequestMerged_1.isPullRequestMerged)(owner, repo, pullRequestNumber, octokit);
         if (mergedBeforeValidations) {
             (0, core_1.error)(`This Pull Request has been merged already.`);
             return;
@@ -51,6 +55,16 @@ function handlePullRequest(pullRequestNumber) {
         const hashTagLabel = customHashTag.replace(/^#*/, '');
         const hashTag = `#${hashTagLabel}`;
         const pullRequest = yield (0, getPullRequest_1.getPullRequest)(owner, repo, pullRequestNumber, octokit);
+        if (pullRequest.auto_merge !== null) {
+            if (pullRequest.auto_merge.enabled_by !== null) {
+                (0, core_1.info)(`Auto-merge is enabled by ${pullRequest.auto_merge.enabled_by.login} (${pullRequest.auto_merge.enabled_by.html_url})`);
+            }
+            else {
+                (0, core_1.info)(`Auto-merge is enabled`);
+            }
+            (0, core_1.setOutput)('skipped', true);
+            return;
+        }
         const accept2shipTitle = (_b = (_a = pullRequest.title) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.includes(hashTag);
         (0, core_1.info)(`${hashTag} ${accept2shipTitle ? '' : 'not '}found in title`);
         const accept2shipBody = (_d = (_c = pullRequest.body) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === null || _d === void 0 ? void 0 : _d.includes(hashTag);
@@ -131,6 +145,40 @@ function handlePullRequest(pullRequestNumber) {
             return;
         }
         (0, core_1.endGroup)();
+        const useAutoMerge = (0, core_1.getBooleanInput)('use-auto-merge');
+        if (useAutoMerge) {
+            if (yield (0, canRepoAutoMerge_1.canRepoAutoMerge)(owner, repo, octokit)) {
+                const pullRequestAutoMergeable = yield (0, getPullRequestAutoMergeable_1.getPullRequestAutoMergeable)(owner, repo, pullRequest, octokit);
+                if (pullRequestAutoMergeable.viewerCanEnableAutoMerge) {
+                    const mergeMethod = (0, getMergeMethod_1.getMergeMethod)();
+                    (0, core_1.info)(`Enabling auto-merge with merge method: ${mergeMethod}`);
+                    yield (0, enablePullRequestAutoMerge_1.enablePullRequestAutoMerge)(owner, repo, pullRequest, pullRequestAutoMergeable.pullRequestId, mergeMethod, octokit);
+                    core_1.summary.addRaw(`Pull Request #${pullRequestNumber} has auto-merge enabled.`, true);
+                    return; // No need to wait for the checks and try to merge.
+                }
+                else {
+                    const pullRequest = yield (0, getPullRequest_1.getPullRequest)(owner, repo, pullRequestNumber, octokit);
+                    if (pullRequest.mergeable) {
+                        (0, core_1.info)(`Auto-merge is not allowed when the Pull Request is mergeable`);
+                    }
+                    else {
+                        const merged = yield (0, isPullRequestMerged_1.isPullRequestMerged)(owner, repo, pullRequestNumber, octokit);
+                        (0, core_1.setOutput)('skipped', !merged);
+                        if (merged) {
+                            (0, core_1.info)(`Auto-merge is not allowed when the Pull Request is already merged`);
+                            return; // No need to wait for the checks.
+                        }
+                        else {
+                            (0, core_1.warning)(`Auto-merge is not allowed for this Pull Request`);
+                            (0, core_1.warning)(`Please set up branch protection for the base branch: ${pullRequest.base.ref}`);
+                        }
+                    }
+                }
+            }
+            else {
+                (0, core_1.error)(`Auto-merge is not enabled for the base repository: ${pullRequest.base.repo.html_url}`);
+            }
+        }
         const jobs = yield (0, getWorkflowRunJobs_1.getWorkflowRunJobs)(owner, repo, octokit);
         (0, core_1.info)(`Current workflow name: ${github_1.context.workflow}`);
         (0, core_1.info)(`Current run id: ${github_1.context.runId}`);
@@ -237,7 +285,7 @@ function handlePullRequest(pullRequestNumber) {
                 worthChecking = false;
             }
         }
-        const mergedAfterValidations = yield (0, mergePullRequest_1.checkIfPullRequestMerged)(owner, repo, pullRequestNumber, octokit);
+        const mergedAfterValidations = yield (0, isPullRequestMerged_1.isPullRequestMerged)(owner, repo, pullRequestNumber, octokit);
         if (mergedAfterValidations) {
             (0, core_1.error)(`This Pull Request has been merged already.`);
             return;

package/dist/isPullRequestMerged.d.ts

@@ -0,0 +1,3 @@
+import type { Octokit } from '@octokit/core';
+import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
+export declare function isPullRequestMerged(owner: string, repo: string, pullRequestNumber: number, octokit: Octokit & Api): Promise<boolean>;

package/dist/isPullRequestMerged.js

@@ -0,0 +1,46 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPullRequestMerged = isPullRequestMerged;
+const request_error_1 = require("@octokit/request-error");
+function isPullRequestMerged(owner, repo, pullRequestNumber, octokit) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const { status } = yield octokit.rest.pulls.checkIfMerged({
+                owner,
+                repo,
+                pull_number: pullRequestNumber,
+            });
+            if (status === 204) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        catch (requestError) {
+            if (requestError instanceof request_error_1.RequestError) {
+                if (requestError.status === 204) {
+                    return true;
+                }
+                else if (requestError.status === 404) {
+                    return false;
+                }
+                else {
+                    throw new Error(`Failed to check if pull request is merged: [${requestError.status}] ${requestError.message}`);
+                }
+            }
+            else {
+                throw requestError;
+            }
+        }
+    });
+}

package/dist/mergePullRequest.d.ts

@@ -1,5 +1,4 @@
 import type { Octokit } from '@octokit/core';
 import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
 import { getMergeMethod } from './getMergeMethod';
-export declare function checkIfPullRequestMerged(owner: string, repo: string, pullRequestNumber: number, octokit: Octokit & Api): Promise<boolean>;
 export declare function mergePullRequest(owner: string, repo: string, pullRequestNumber: number, mergeMethod: ReturnType<typeof getMergeMethod>, octokit: Octokit & Api): Promise<void>;

package/dist/mergePullRequest.js

@@ -9,45 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkIfPullRequestMerged = checkIfPullRequestMerged;
 exports.mergePullRequest = mergePullRequest;
 const console_1 = require("console");
 const core_1 = require("@actions/core");
 const github_1 = require("@actions/github");
 const request_error_1 = require("@octokit/request-error");
-function checkIfPullRequestMerged(owner, repo, pullRequestNumber, octokit) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { status } = yield octokit.rest.pulls.checkIfMerged({
-                owner,
-                repo,
-                pull_number: pullRequestNumber,
-            });
-            if (status === 204) {
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
-        catch (requestError) {
-            if (requestError instanceof request_error_1.RequestError) {
-                if (requestError.status === 204) {
-                    return true;
-                }
-                else if (requestError.status === 404) {
-                    return false;
-                }
-                else {
-                    throw new Error(`Failed to check if pull request is merged: [${requestError.status}] ${requestError.message}`);
-                }
-            }
-            else {
-                throw requestError;
-            }
-        }
-    });
-}
+const isPullRequestMerged_1 = require("./isPullRequestMerged");
 function mergePullRequest(owner, repo, pullRequestNumber, mergeMethod, octokit) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -86,7 +53,8 @@ function mergePullRequest(owner, repo, pullRequestNumber, mergeMethod, octokit)
                 (0, core_1.warning)(`Failed to merge the Pull Request: [${requestError.status}] ${requestError.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);
+                const merged = yield (0, isPullRequestMerged_1.isPullRequestMerged)(owner, repo, pullRequestNumber, octokit);
+                (0, core_1.setOutput)('skipped', !merged);
                 if (merged) {
                     try {
                         const { data: pullRequest } = yield octokit.rest.pulls.get({
@@ -105,7 +73,6 @@ function mergePullRequest(owner, repo, pullRequestNumber, mergeMethod, octokit)
                     (0, core_1.error)(`This Pull Request remains unmerged.`);
                     (0, core_1.setFailed)(`Failed to merge this Pull Request when conditions are met.`);
                 }
-                (0, core_1.setOutput)('skipped', !merged);
             }
             else {
                 throw requestError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accept-to-ship-action",
-  "version": "0.6.7",
+  "version": "0.7.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.js",
@@ -49,7 +49,7 @@
     "@actions/github": "^6.0.0",
     "@octokit/plugin-retry": "^7.1.2",
     "@octokit/plugin-throttling": "^9.3.0",
-    "@octokit/webhooks-definitions": "^3.67.3"
+    "@octokit/webhooks-types": "^7.6.1"
   },
   "lint-staged": {
     "*.(ts,js)": "yarn lint --fix",