accept-to-ship-action 0.8.4 → 0.8.6

package/dist/__graphql__/graphql.d.ts

@@ -949,6 +949,21 @@ export type ArchiveProjectV2ItemPayload = {
     /** The item archived from the project. */
     item?: Maybe<ProjectV2Item>;
 };
+/** Autogenerated input type of ArchivePullRequest */
+export type ArchivePullRequestInput = {
+    /** A unique identifier for the client performing the mutation. */
+    clientMutationId?: InputMaybe<Scalars['String']['input']>;
+    /** The Node ID of the pull request to archive. */
+    pullRequestId: Scalars['ID']['input'];
+};
+/** Autogenerated return type of ArchivePullRequest. */
+export type ArchivePullRequestPayload = {
+    __typename: 'ArchivePullRequestPayload';
+    /** A unique identifier for the client performing the mutation. */
+    clientMutationId?: Maybe<Scalars['String']['output']>;
+    /** The pull request that was archived. */
+    pullRequest?: Maybe<PullRequest>;
+};
 /** Autogenerated input type of ArchiveRepository */
 export type ArchiveRepositoryInput = {
     /** A unique identifier for the client performing the mutation. */
@@ -11986,6 +12001,11 @@ export type Mutation = {
     approveVerifiableDomain?: Maybe<ApproveVerifiableDomainPayload>;
     /** Archives a ProjectV2Item */
     archiveProjectV2Item?: Maybe<ArchiveProjectV2ItemPayload>;
+    /**
+     * Archive a pull request. Closes, locks, and marks the pull request as archived.
+     * Only repository admins can archive pull requests.
+     */
+    archivePullRequest?: Maybe<ArchivePullRequestPayload>;
     /** Marks a repository as archived. */
     archiveRepository?: Maybe<ArchiveRepositoryPayload>;
     /** Cancels a pending invitation for an administrator to join an enterprise. */
@@ -12380,6 +12400,12 @@ export type Mutation = {
     transferIssue?: Maybe<TransferIssuePayload>;
     /** Unarchives a ProjectV2Item */
     unarchiveProjectV2Item?: Maybe<UnarchiveProjectV2ItemPayload>;
+    /**
+     * Unarchive a pull request. Removes the archived flag from the pull request.
+     * Does not automatically reopen or unlock the pull request. Only repository
+     * admins can unarchive pull requests.
+     */
+    unarchivePullRequest?: Maybe<UnarchivePullRequestPayload>;
     /** Unarchives a repository. */
     unarchiveRepository?: Maybe<UnarchiveRepositoryPayload>;
     /** Unfollow an organization. */
@@ -12705,6 +12731,10 @@ export type MutationArchiveProjectV2ItemArgs = {
     input: ArchiveProjectV2ItemInput;
 };
 /** The root query for implementing GraphQL mutations. */
+export type MutationArchivePullRequestArgs = {
+    input: ArchivePullRequestInput;
+};
+/** The root query for implementing GraphQL mutations. */
 export type MutationArchiveRepositoryArgs = {
     input: ArchiveRepositoryInput;
 };
@@ -13313,6 +13343,10 @@ export type MutationUnarchiveProjectV2ItemArgs = {
     input: UnarchiveProjectV2ItemInput;
 };
 /** The root query for implementing GraphQL mutations. */
+export type MutationUnarchivePullRequestArgs = {
+    input: UnarchivePullRequestInput;
+};
+/** The root query for implementing GraphQL mutations. */
 export type MutationUnarchiveRepositoryArgs = {
     input: UnarchiveRepositoryInput;
 };
@@ -31032,6 +31066,21 @@ export type UnarchiveProjectV2ItemPayload = {
     /** The item unarchived from the project. */
     item?: Maybe<ProjectV2Item>;
 };
+/** Autogenerated input type of UnarchivePullRequest */
+export type UnarchivePullRequestInput = {
+    /** A unique identifier for the client performing the mutation. */
+    clientMutationId?: InputMaybe<Scalars['String']['input']>;
+    /** The Node ID of the pull request to unarchive. */
+    pullRequestId: Scalars['ID']['input'];
+};
+/** Autogenerated return type of UnarchivePullRequest. */
+export type UnarchivePullRequestPayload = {
+    __typename: 'UnarchivePullRequestPayload';
+    /** A unique identifier for the client performing the mutation. */
+    clientMutationId?: Maybe<Scalars['String']['output']>;
+    /** The pull request that was unarchived. */
+    pullRequest?: Maybe<PullRequest>;
+};
 /** Autogenerated input type of UnarchiveRepository */
 export type UnarchiveRepositoryInput = {
     /** A unique identifier for the client performing the mutation. */

package/dist/enablePullRequestAutoMerge.d.ts

@@ -1,4 +1,4 @@
 import type { Octokit } from '@octokit/core';
 import type { Api, RestEndpointMethodTypes } from '@octokit/plugin-rest-endpoint-methods';
 import { getMergeMethod } from './getMergeMethod.js';
-export declare function enablePullRequestAutoMerge(owner: string, repo: string, pullRequest: RestEndpointMethodTypes['pulls']['get']['response']['data'], pullRequestId: string, mergeMethod: ReturnType<typeof getMergeMethod>, octokit: Octokit & Api): Promise<void>;
+export declare function enablePullRequestAutoMerge(owner: string, repo: string, pullRequest: RestEndpointMethodTypes['pulls']['get']['response']['data'], pullRequestId: string, mergeMethod: ReturnType<typeof getMergeMethod>, octokit: Octokit & Api): Promise<boolean>;

package/dist/enablePullRequestAutoMerge.js

@@ -1,5 +1,6 @@
 import { error, info, setFailed, setOutput, warning } from '@actions/core';
 import { context } from '@actions/github';
+import { GraphqlResponseError } from '@octokit/graphql';
 import { RequestError } from '@octokit/request-error';
 import { graphql } from './__graphql__/gql.js';
 import { isPullRequestMerged } from './isPullRequestMerged.js';
@@ -44,35 +45,43 @@ export async function enablePullRequestAutoMerge(owner, repo, pullRequest, pullR
                 info(`Failed to comment on the Pull Request: [${requestError.status}] ${requestError.message}`);
             }
         }
+        return true;
     }
     catch (requestError) {
         if (requestError instanceof RequestError) {
             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 = await isPullRequestMerged(owner, repo, pullRequestNumber, octokit);
-            setOutput('skipped', !merged);
-            if (merged) {
-                try {
-                    const { data: pullRequest } = await octokit.rest.pulls.get({
-                        owner,
-                        repo,
-                        pull_number: pullRequestNumber,
-                    });
-                    warning(`This Pull Request has been merged by: ${pullRequest.merged_by?.login} (${pullRequest.merged_by?.html_url})`);
-                }
-                catch {
-                    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.
-                error(`This Pull Request remains unmerged.`);
-                setFailed(`Failed to merge this Pull Request when conditions are met.`);
+        }
+        else if (requestError instanceof GraphqlResponseError) {
+            for (const graphqlError of requestError.errors ?? []) {
+                warning(`Failed to enable auto-merge for the Pull Request: ${graphqlError.message}`);
             }
         }
         else {
             throw requestError;
         }
+        // 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 = await isPullRequestMerged(owner, repo, pullRequestNumber, octokit);
+        setOutput('skipped', !merged);
+        if (merged) {
+            try {
+                const { data: pullRequest } = await octokit.rest.pulls.get({
+                    owner,
+                    repo,
+                    pull_number: pullRequestNumber,
+                });
+                warning(`This Pull Request has been merged by: ${pullRequest.merged_by?.login} (${pullRequest.merged_by?.html_url})`);
+            }
+            catch {
+                warning(`This Pull Request has been merged by unknown user.`);
+            }
+            return false;
+        }
+        else {
+            // If it's not merged by someone else in a race condition then we treat it as a real error.
+            error(`This Pull Request remains unmerged.`);
+            setFailed(`Failed to enable auto-merge for this Pull Request when conditions are met.`);
+            return false;
+        }
     }
 }

package/dist/index.js

@@ -143,8 +143,12 @@ async function handlePullRequest(pullRequestNumber) {
             if (pullRequestAutoMergeable.viewerCanEnableAutoMerge) {
                 const mergeMethod = getMergeMethod();
                 info(`Enabling auto-merge with merge method: ${mergeMethod}`);
-                await enablePullRequestAutoMerge(owner, repo, pullRequest, pullRequestAutoMergeable.pullRequestId, mergeMethod, octokit);
-                summary.addRaw(`Pull Request #${pullRequestNumber} has auto-merge enabled.`, true);
+                const autoMergeEnabled = await enablePullRequestAutoMerge(owner, repo, pullRequest, pullRequestAutoMergeable.pullRequestId, mergeMethod, octokit);
+                if (autoMergeEnabled) {
+                    await summary
+                        .addRaw(`Pull Request #${pullRequestNumber} has auto-merge enabled.`, true)
+                        .write();
+                }
                 return; // No need to wait for the checks and try to merge.
             }
             else {
@@ -303,7 +307,9 @@ async function handlePullRequest(pullRequestNumber) {
     const mergeMethod = getMergeMethod();
     info(`Merging with merge method: ${mergeMethod}`);
     await mergePullRequest(owner, repo, pullRequestNumber, mergeMethod, octokit);
-    summary.addRaw(`Pull Request #${pullRequestNumber} has been merged.`, true);
+    await summary
+        .addRaw(`Pull Request #${pullRequestNumber} has been merged.`, true)
+        .write();
 }
 async function run() {
     info(`Event name: ${context.eventName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "accept-to-ship-action",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "This GitHub Action automatically merges approved pull requests when they include an #accept2ship trigger.",
   "license": "MIT",
   "repository": {
@@ -31,6 +31,7 @@
     "@actions/github": "^9.0.0",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@octokit/core": "^7.0.0",
+    "@octokit/graphql": "^9.0.3",
     "@octokit/plugin-retry": "^8.0.1",
     "@octokit/plugin-throttling": "^11.0.1",
     "@octokit/webhooks-types": "^7.6.1"
@@ -39,9 +40,9 @@
     "@0no-co/graphqlsp": "^1.12.12",
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^10.0.1",
-    "@graphql-codegen/cli": "6.2.1",
-    "@graphql-codegen/typescript": "5.0.9",
-    "@graphql-codegen/typescript-document-nodes": "5.0.9",
+    "@graphql-codegen/cli": "6.3.0",
+    "@graphql-codegen/typescript": "5.0.10",
+    "@graphql-codegen/typescript-document-nodes": "5.0.10",
     "@graphql-eslint/eslint-plugin": "^4.4.0",
     "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@types/node": "^25.3.5",