renovate 44.72.0 → 44.73.0

package/dist/modules/platform/github/graphql.js

@@ -87,6 +87,22 @@ query($owner: String!, $name: String!, $number: Int!) {
   }
 }
 `;
+const enqueuePullRequestMutation = `
+mutation EnqueuePullRequest(
+  $pullRequestId: ID!,
+) {
+  enqueuePullRequest(
+    input: {
+      pullRequestId: $pullRequestId,
+    }
+  ) {
+    mergeQueueEntry {
+      id
+      position
+    }
+  }
+}
+`;
 const enableAutoMergeMutation = `
 mutation EnablePullRequestAutoMerge(
   $pullRequestId: ID!,
@@ -109,6 +125,6 @@ mutation EnablePullRequestAutoMerge(
 }
 `;
 //#endregion
-export { enableAutoMergeMutation, getIssuesQuery, prIsInMergeQueueQuery, repoInfoQuery, repoMergeQueueQuery };
+export { enableAutoMergeMutation, enqueuePullRequestMutation, getIssuesQuery, prIsInMergeQueueQuery, repoInfoQuery, repoMergeQueueQuery };
 
 //# sourceMappingURL=graphql.js.map

package/dist/modules/platform/github/graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.js","names":[],"sources":["../../../../lib/modules/platform/github/graphql.ts"],"sourcesContent":["export const repoInfoQuery = `\nquery($owner: String!, $name: String!, $user: String) {\n  repository(owner: $owner, name: $name) {\n    id\n    sshUrl\n    isFork\n    parent {\n      nameWithOwner\n    }\n    isArchived\n    nameWithOwner\n    hasIssuesEnabled\n    hasVulnerabilityAlertsEnabled\n    autoMergeAllowed\n    mergeCommitAllowed\n    rebaseMergeAllowed\n    squashMergeAllowed\n    mergeQueue { id }\n    defaultBranchRef {\n      name\n      target {\n        oid\n      }\n    }\n    issues(\n      orderBy: { field: UPDATED_AT, direction: DESC },\n      filterBy: { createdBy: $user },\n      first: 5\n    ) {\n      nodes {\n        number\n        state\n        title\n        body\n        updatedAt\n      }\n    }\n  }\n}\n`;\n\nexport const getIssuesQuery = `\nquery(\n  $owner: String!,\n  $name: String!,\n  $user: String,\n  $count: Int,\n  $cursor: String\n) {\n  repository(owner: $owner, name: $name) {\n    issues(\n      orderBy: { field: UPDATED_AT, direction: DESC },\n      filterBy: { createdBy: $user },\n      first: $count,\n      after: $cursor\n    ) {\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n      nodes {\n        number\n        state\n        title\n        body\n        updatedAt\n      }\n    }\n  }\n}\n`;\n\nexport const repoMergeQueueQuery = `\nquery($owner: String!, $name: String!, $branch: String!) {\n  repository(owner: $owner, name: $name) {\n    mergeQueue(branch: $branch) {\n      id\n    }\n  }\n}\n`;\n\nexport const prIsInMergeQueueQuery = `\nquery($owner: String!, $name: String!, $number: Int!) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      isInMergeQueue\n    }\n  }\n}\n`;\n\nexport const enableAutoMergeMutation = `\nmutation EnablePullRequestAutoMerge(\n  $pullRequestId: ID!,\n  $mergeMethod: PullRequestMergeMethod!,\n  $commitHeadline: String,\n  $commitBody: String,\n) {\n  enablePullRequestAutoMerge(\n    input: {\n      pullRequestId: $pullRequestId,\n      mergeMethod: $mergeMethod,\n      commitHeadline: $commitHeadline,\n      commitBody: $commitBody,\n    }\n  ) {\n    pullRequest {\n      number\n    }\n  }\n}\n`;\n"],"mappings":";AAAA,MAAa,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyC7B,MAAa,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+B9B,MAAa,sBAAsB;;;;;;;;;AAUnC,MAAa,wBAAwB;;;;;;;;;AAUrC,MAAa,0BAA0B"}
+{"version":3,"file":"graphql.js","names":[],"sources":["../../../../lib/modules/platform/github/graphql.ts"],"sourcesContent":["export const repoInfoQuery = `\nquery($owner: String!, $name: String!, $user: String) {\n  repository(owner: $owner, name: $name) {\n    id\n    sshUrl\n    isFork\n    parent {\n      nameWithOwner\n    }\n    isArchived\n    nameWithOwner\n    hasIssuesEnabled\n    hasVulnerabilityAlertsEnabled\n    autoMergeAllowed\n    mergeCommitAllowed\n    rebaseMergeAllowed\n    squashMergeAllowed\n    mergeQueue { id }\n    defaultBranchRef {\n      name\n      target {\n        oid\n      }\n    }\n    issues(\n      orderBy: { field: UPDATED_AT, direction: DESC },\n      filterBy: { createdBy: $user },\n      first: 5\n    ) {\n      nodes {\n        number\n        state\n        title\n        body\n        updatedAt\n      }\n    }\n  }\n}\n`;\n\nexport const getIssuesQuery = `\nquery(\n  $owner: String!,\n  $name: String!,\n  $user: String,\n  $count: Int,\n  $cursor: String\n) {\n  repository(owner: $owner, name: $name) {\n    issues(\n      orderBy: { field: UPDATED_AT, direction: DESC },\n      filterBy: { createdBy: $user },\n      first: $count,\n      after: $cursor\n    ) {\n      pageInfo {\n        endCursor\n        hasNextPage\n      }\n      nodes {\n        number\n        state\n        title\n        body\n        updatedAt\n      }\n    }\n  }\n}\n`;\n\nexport const repoMergeQueueQuery = `\nquery($owner: String!, $name: String!, $branch: String!) {\n  repository(owner: $owner, name: $name) {\n    mergeQueue(branch: $branch) {\n      id\n    }\n  }\n}\n`;\n\nexport const prIsInMergeQueueQuery = `\nquery($owner: String!, $name: String!, $number: Int!) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      isInMergeQueue\n    }\n  }\n}\n`;\n\nexport const enqueuePullRequestMutation = `\nmutation EnqueuePullRequest(\n  $pullRequestId: ID!,\n) {\n  enqueuePullRequest(\n    input: {\n      pullRequestId: $pullRequestId,\n    }\n  ) {\n    mergeQueueEntry {\n      id\n      position\n    }\n  }\n}\n`;\n\nexport const enableAutoMergeMutation = `\nmutation EnablePullRequestAutoMerge(\n  $pullRequestId: ID!,\n  $mergeMethod: PullRequestMergeMethod!,\n  $commitHeadline: String,\n  $commitBody: String,\n) {\n  enablePullRequestAutoMerge(\n    input: {\n      pullRequestId: $pullRequestId,\n      mergeMethod: $mergeMethod,\n      commitHeadline: $commitHeadline,\n      commitBody: $commitBody,\n    }\n  ) {\n    pullRequest {\n      number\n    }\n  }\n}\n`;\n"],"mappings":";AAAA,MAAa,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyC7B,MAAa,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+B9B,MAAa,sBAAsB;;;;;;;;;AAUnC,MAAa,wBAAwB;;;;;;;;;AAUrC,MAAa,6BAA6B;;;;;;;;;;;;;;;;AAiB1C,MAAa,0BAA0B"}

package/dist/modules/platform/github/index.js

@@ -28,10 +28,10 @@ import { repoFingerprint } from "../util.js";
 import { smartTruncate } from "../utils/pr-body.js";
 import { coerceRestPr, githubApi, mapMergeStartegy } from "./common.js";
 import { remoteBranchExists } from "./branch.js";
-import { enableAutoMergeMutation, getIssuesQuery, repoInfoQuery, repoMergeQueueQuery } from "./graphql.js";
+import { enableAutoMergeMutation, enqueuePullRequestMutation, getIssuesQuery, repoInfoQuery, repoMergeQueueQuery } from "./graphql.js";
 import { GithubIssueCache } from "./issue.js";
 import { massageMarkdownLinks } from "./massage-markdown-links.js";
-import { getPrCache, isPrInMergeQueue, updatePrCache } from "./pr.js";
+import { getPrCache, isPrInMergeQueue as isPrInMergeQueue$1, updatePrCache } from "./pr.js";
 import { getAppDetails, getUserDetails, getUserEmail } from "./user.js";
 import { getRepoUrl, isGithubEnterpriseServer, warnIfDefaultGitAuthorEmail } from "./utils.js";
 import { isArray, isNonEmptyObject, isNonEmptyString } from "@sindresorhus/is";
@@ -69,7 +69,9 @@ var github_exports = /* @__PURE__ */ __exportAll({
 	id: () => id,
 	initPlatform: () => initPlatform,
 	initRepo: () => initRepo,
+	isBranchMergeQueueEnabled: () => isBranchMergeQueueEnabled,
 	isGHApp: () => isGHApp,
+	isPrInMergeQueue: () => isPrInMergeQueue,
 	listForks: () => listForks,
 	massageMarkdown: () => massageMarkdown,
 	maxBodyLength: () => maxBodyLength,
@@ -1246,7 +1248,7 @@ async function createPr({ sourceBranch, targetBranch, prTitle: title, prBody: ra
 	cachePr(result);
 	return result;
 }
-async function isMergeQueueEnabled(baseBranch) {
+async function isBranchMergeQueueEnabled(baseBranch) {
 	const cachedResult = config.mergeQueueEnabled[baseBranch];
 	if (cachedResult !== void 0) return cachedResult;
 	if (isGithubEnterpriseServer(platformConfig.host) && semver.satisfies(platformConfig.host.version ?? "", "<3.12.0")) {
@@ -1279,14 +1281,17 @@ async function isMergeQueueEnabled(baseBranch) {
 	config.mergeQueueEnabled[baseBranch] = result;
 	return result;
 }
+function isPrInMergeQueue(prNo) {
+	return isPrInMergeQueue$1(githubApi, config.repositoryOwner, config.repositoryName, prNo);
+}
 async function assertPrNotInMergeQueue(branchName, baseBranch) {
-	if (!await isMergeQueueEnabled(baseBranch ?? config.defaultBranch)) return;
+	if (!await isBranchMergeQueueEnabled(baseBranch ?? config.defaultBranch)) return;
 	const pr = await findPr({
 		branchName,
 		state: "open"
 	});
 	if (!pr) return;
-	if (await isPrInMergeQueue(githubApi, config.repositoryOwner, config.repositoryName, pr.number)) {
+	if (await isPrInMergeQueue(pr.number)) {
 		logger.debug(`PR #${pr.number} is in the merge queue - aborting push`);
 		throw new Error(PR_ALREADY_IN_MERGE_QUEUE);
 	}
@@ -1323,8 +1328,38 @@ async function reattemptPlatformAutomerge({ number, platformPrOptions }) {
 		logger.warn({ err }, "Error re-attempting PR platform automerge");
 	}
 }
+async function tryEnqueuePr(pr) {
+	const prNo = pr.number;
+	try {
+		const res = await githubApi.requestGraphql(enqueuePullRequestMutation, {
+			variables: { pullRequestId: pr.node_id },
+			count: 1
+		});
+		if (res?.errors) {
+			if (res.errors.some((error) => regEx(/already.*queue/i).test(error.message))) {
+				logger.debug(`PR #${prNo} is already in the merge queue`);
+				return true;
+			}
+			logger.debug({
+				prNumber: prNo,
+				errors: res.errors
+			}, "Failed to add PR to the merge queue");
+			return false;
+		}
+		logger.debug(`PR #${prNo} added to the merge queue`);
+		return true;
+	} catch (err) {
+		logger.warn({
+			prNumber: prNo,
+			err
+		}, "Failed to add PR to the merge queue");
+		return false;
+	}
+}
 async function mergePr({ branchName, id: prNo, strategy }) {
 	logger.debug(`mergePr(${prNo}, ${branchName})`);
+	const pr = await getPr(prNo);
+	if (pr?.targetBranch && await isBranchMergeQueueEnabled(pr.targetBranch)) return tryEnqueuePr(pr);
 	const url = `repos/${config.parentRepo ?? config.repository}/pulls/${prNo}/merge`;
 	const options = { body: {} };
 	/* v8 ignore next -- fork mode is not exercised in mergePr specs */
@@ -1503,6 +1538,6 @@ async function commitFiles(config) {
 	return await fetchBranch(branchName);
 }
 //#endregion
-export { addAssignees, addLabels, addReviewers, assertPrNotInMergeQueue, commitFiles, createFork, createPr, deleteLabel, ensureComment, ensureCommentRemoval, ensureIssue, ensureIssueClosing, findFork, findIssue, findPr, getBranchForceRebase, getBranchPr, getBranchStatus, getBranchStatusCheck, getIssue, getIssueList, getJsonFile, getPr, getPrList, getRawFile, getRepos, getVulnerabilityAlerts, github_exports, id, initPlatform, initRepo, isGHApp, listForks, massageMarkdown, maxBodyLength, mergePr, reattemptPlatformAutomerge, resetConfigs, setBranchStatus, tryReuseAutoclosedPr, updatePr };
+export { addAssignees, addLabels, addReviewers, assertPrNotInMergeQueue, commitFiles, createFork, createPr, deleteLabel, ensureComment, ensureCommentRemoval, ensureIssue, ensureIssueClosing, findFork, findIssue, findPr, getBranchForceRebase, getBranchPr, getBranchStatus, getBranchStatusCheck, getIssue, getIssueList, getJsonFile, getPr, getPrList, getRawFile, getRepos, getVulnerabilityAlerts, github_exports, id, initPlatform, initRepo, isBranchMergeQueueEnabled, isGHApp, isPrInMergeQueue, listForks, massageMarkdown, maxBodyLength, mergePr, reattemptPlatformAutomerge, resetConfigs, setBranchStatus, tryReuseAutoclosedPr, updatePr };
 
 //# sourceMappingURL=index.js.map