renovate 40.0.0-next.17 → 40.0.0-next.19

package/dist/modules/platform/github/common.d.ts

@@ -1,7 +1,9 @@
 import { GithubHttp } from '../../../util/http/github';
+import type { MergePRConfig } from '../types';
 import type { GhPr, GhRestPr } from './types';
 export declare const githubApi: GithubHttp;
 /**
  * @see https://docs.github.com/en/rest/reference/pulls#list-pull-requests
  */
 export declare function coerceRestPr(pr: GhRestPr): GhPr;
+export declare function mapMergeStartegy(strategy: MergePRConfig['strategy']): string | undefined;

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

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.githubApi = void 0;
 exports.coerceRestPr = coerceRestPr;
+exports.mapMergeStartegy = mapMergeStartegy;
 const tslib_1 = require("tslib");
 const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
+const logger_1 = require("../../../logger");
 const github_1 = require("../../../util/http/github");
 const pr_body_1 = require("../pr-body");
 exports.githubApi = new github_1.GithubHttp();
@@ -49,4 +51,18 @@ function coerceRestPr(pr) {
     }
     return result;
 }
+function mapMergeStartegy(strategy) {
+    switch (strategy) {
+        case 'auto':
+            return undefined;
+        case 'fast-forward': {
+            logger_1.logger.warn('Fast-forward merge strategy is not supported by Github. Falling back to merge strategy set for the repository.');
+            return undefined;
+        }
+        case 'merge-commit':
+            return 'merge';
+        default:
+            return strategy;
+    }
+}
 //# sourceMappingURL=common.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/modules/platform/github/common.ts"],"names":[],"mappings":";;;AAUA,oCAgDC;;AA1DD,kEAAkC;AAClC,sDAAuD;AACvD,wCAA6C;AAGhC,QAAA,SAAS,GAAG,IAAI,mBAAU,EAAE,CAAC;AAE1C;;GAEG;AACH,SAAgB,YAAY,CAAC,EAAY;IACvC,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,IAAI,IAAA,yBAAe,EAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAS;QACnB,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG;QAC1B,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,KAAK,EACH,EAAE,CAAC,KAAK,KAAK,QAAQ,IAAI,YAAE,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK;QACxE,UAAU;QACV,UAAU,EAAE,EAAE,CAAC,UAAU;QACzB,OAAO,EAAE,EAAE,CAAC,OAAO;KACpB,CAAC;IAEF,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;QACjB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;IAC3B,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC7C,CAAC;IAED,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QACd,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,IAAI,YAAE,CAAC,aAAa,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,IAAI,EAAE,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,mBAAmB;aACtC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,YAAE,CAAC,cAAc,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,UAAU,CAAC;IACnC,CAAC;IAED,IAAI,EAAE,CAAC,SAAS,EAAE,CAAC;QACjB,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;QACjB,MAAM,CAAC,YAAY,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;IACpC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { GithubHttp } from '../../../util/http/github';\nimport { getPrBodyStruct } from '../pr-body';\nimport type { GhPr, GhRestPr } from './types';\n\nexport const githubApi = new GithubHttp();\n\n/**\n * @see https://docs.github.com/en/rest/reference/pulls#list-pull-requests\n */\nexport function coerceRestPr(pr: GhRestPr): GhPr {\n  const bodyStruct = pr.bodyStruct ?? getPrBodyStruct(pr.body);\n  const result: GhPr = {\n    number: pr.number,\n    sourceBranch: pr.head?.ref,\n    title: pr.title,\n    state:\n      pr.state === 'closed' && is.string(pr.merged_at) ? 'merged' : pr.state,\n    bodyStruct,\n    updated_at: pr.updated_at,\n    node_id: pr.node_id,\n  };\n\n  if (pr.head?.sha) {\n    result.sha = pr.head.sha;\n  }\n\n  if (pr.head?.repo?.full_name) {\n    result.sourceRepo = pr.head.repo.full_name;\n  }\n\n  if (pr.labels) {\n    result.labels = pr.labels.map(({ name }) => name);\n  }\n\n  if (!!pr.assignee || is.nonEmptyArray(pr.assignees)) {\n    result.hasAssignees = true;\n  }\n\n  if (pr.requested_reviewers) {\n    result.reviewers = pr.requested_reviewers\n      .map(({ login }) => login)\n      .filter(is.nonEmptyString);\n  }\n\n  if (pr.created_at) {\n    result.createdAt = pr.created_at;\n  }\n\n  if (pr.closed_at) {\n    result.closedAt = pr.closed_at;\n  }\n\n  if (pr.base?.ref) {\n    result.targetBranch = pr.base.ref;\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/modules/platform/github/common.ts"],"names":[],"mappings":";;;AAYA,oCAgDC;AAED,4CAiBC;;AA/ED,kEAAkC;AAClC,4CAAyC;AACzC,sDAAuD;AACvD,wCAA6C;AAIhC,QAAA,SAAS,GAAG,IAAI,mBAAU,EAAE,CAAC;AAE1C;;GAEG;AACH,SAAgB,YAAY,CAAC,EAAY;IACvC,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,IAAI,IAAA,yBAAe,EAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAS;QACnB,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG;QAC1B,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,KAAK,EACH,EAAE,CAAC,KAAK,KAAK,QAAQ,IAAI,YAAE,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK;QACxE,UAAU;QACV,UAAU,EAAE,EAAE,CAAC,UAAU;QACzB,OAAO,EAAE,EAAE,CAAC,OAAO;KACpB,CAAC;IAEF,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;QACjB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;IAC3B,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC7C,CAAC;IAED,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QACd,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,IAAI,YAAE,CAAC,aAAa,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,IAAI,EAAE,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,mBAAmB;aACtC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,YAAE,CAAC,cAAc,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,UAAU,CAAC;IACnC,CAAC;IAED,IAAI,EAAE,CAAC,SAAS,EAAE,CAAC;QACjB,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;QACjB,MAAM,CAAC,YAAY,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;IACpC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,gBAAgB,CAC9B,QAAmC;IAEnC,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,SAAS,CAAC;QACnB,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,eAAM,CAAC,IAAI,CACT,gHAAgH,CACjH,CAAC;YACF,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,KAAK,cAAc;YACjB,OAAO,OAAO,CAAC;QACjB;YACE,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { logger } from '../../../logger';\nimport { GithubHttp } from '../../../util/http/github';\nimport { getPrBodyStruct } from '../pr-body';\nimport type { MergePRConfig } from '../types';\nimport type { GhPr, GhRestPr } from './types';\n\nexport const githubApi = new GithubHttp();\n\n/**\n * @see https://docs.github.com/en/rest/reference/pulls#list-pull-requests\n */\nexport function coerceRestPr(pr: GhRestPr): GhPr {\n  const bodyStruct = pr.bodyStruct ?? getPrBodyStruct(pr.body);\n  const result: GhPr = {\n    number: pr.number,\n    sourceBranch: pr.head?.ref,\n    title: pr.title,\n    state:\n      pr.state === 'closed' && is.string(pr.merged_at) ? 'merged' : pr.state,\n    bodyStruct,\n    updated_at: pr.updated_at,\n    node_id: pr.node_id,\n  };\n\n  if (pr.head?.sha) {\n    result.sha = pr.head.sha;\n  }\n\n  if (pr.head?.repo?.full_name) {\n    result.sourceRepo = pr.head.repo.full_name;\n  }\n\n  if (pr.labels) {\n    result.labels = pr.labels.map(({ name }) => name);\n  }\n\n  if (!!pr.assignee || is.nonEmptyArray(pr.assignees)) {\n    result.hasAssignees = true;\n  }\n\n  if (pr.requested_reviewers) {\n    result.reviewers = pr.requested_reviewers\n      .map(({ login }) => login)\n      .filter(is.nonEmptyString);\n  }\n\n  if (pr.created_at) {\n    result.createdAt = pr.created_at;\n  }\n\n  if (pr.closed_at) {\n    result.closedAt = pr.closed_at;\n  }\n\n  if (pr.base?.ref) {\n    result.targetBranch = pr.base.ref;\n  }\n\n  return result;\n}\n\nexport function mapMergeStartegy(\n  strategy: MergePRConfig['strategy'],\n): string | undefined {\n  switch (strategy) {\n    case 'auto':\n      return undefined;\n    case 'fast-forward': {\n      logger.warn(\n        'Fast-forward merge strategy is not supported by Github. Falling back to merge strategy set for the repository.',\n      );\n      return undefined;\n    }\n    case 'merge-commit':\n      return 'merge';\n    default:\n      return strategy;\n  }\n}\n"]}

package/dist/modules/platform/github/index.d.ts

@@ -38,7 +38,7 @@ export declare function ensureCommentRemoval(deleteConfig: EnsureCommentRemovalC
 export declare function createPr({ sourceBranch, targetBranch, prTitle: title, prBody: rawBody, labels, draftPR, platformPrOptions, milestone, }: CreatePRConfig): Promise<GhPr | null>;
 export declare function updatePr({ number: prNo, prTitle: title, prBody: rawBody, addLabels: labelsToAdd, removeLabels, state, targetBranch, }: UpdatePrConfig): Promise<void>;
 export declare function reattemptPlatformAutomerge({ number, platformPrOptions, }: ReattemptPlatformAutomergeConfig): Promise<void>;
-export declare function mergePr({ branchName, id: prNo, }: MergePRConfig): Promise<boolean>;
+export declare function mergePr({ branchName, id: prNo, strategy, }: MergePRConfig): Promise<boolean>;
 export declare function massageMarkdown(input: string): string;
 export declare function maxBodyLength(): number;
 export declare function getVulnerabilityAlerts(): Promise<VulnerabilityAlert[]>;

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

@@ -1394,7 +1394,7 @@ async function reattemptPlatformAutomerge({ number, platformPrOptions, }) {
         logger_1.logger.warn({ err }, 'Error re-attempting PR platform automerge');
     }
 }
-async function mergePr({ branchName, id: prNo, }) {
+async function mergePr({ branchName, id: prNo, strategy, }) {
     logger_1.logger.debug(`mergePr(${prNo}, ${branchName})`);
     const url = `repos/${config.parentRepo ?? config.repository}/pulls/${prNo}/merge`;
     const options = {
@@ -1406,9 +1406,11 @@ async function mergePr({ branchName, id: prNo, }) {
     }
     let automerged = false;
     let automergeResult;
-    if (config.mergeMethod) {
-        // This path is taken if we have auto-detected the allowed merge types from the repo
-        options.body.merge_method = config.mergeMethod;
+    const mergeStrategy = (0, common_2.mapMergeStartegy)(strategy) ?? config.mergeMethod;
+    if (mergeStrategy) {
+        // This path is taken if we have auto-detected the allowed merge types from the repo or
+        // automergeStrategy is configured by user
+        options.body.merge_method = mergeStrategy;
         try {
             logger_1.logger.debug({ options, url }, `mergePr`);
             automergeResult = await common_2.githubApi.putJson(url, options);