diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md
index 8dfac52d901fc2316efc2a8ba7d1b36413489616..f414adf6d7794a65d9eae0b0a50f7d792a6b2f13 100644
--- a/docs/usage/configuration-options.md
+++ b/docs/usage/configuration-options.md
@@ -219,12 +219,6 @@ Setting this to `true` will automatically approve the PRs in Azure DevOps.
You can also configure this using `packageRules` if you want to use it selectively (e.g. per-package).
-## azureAutoComplete
-
-Setting this to `true` will configure PRs in Azure DevOps to auto-complete after all (if any) branch policies have been met.
-
-You can also configure this using `packageRules` if you want to use it selectively (e.g. per-package).
-
## azureWorkItemId
When creating a PR in Azure DevOps, some branches can be protected with branch policies to [check for linked work items](https://docs.microsoft.com/en-us/azure/devops/repos/git/branch-policies?view=azure-devops#check-for-linked-work-items).
@@ -756,12 +750,6 @@ Example:
}
```
-## gitLabAutomerge
-
-If you enabled `automerge` in the Renovate config, you can speed up the automerge process by using GitLab's own automerge function.
-Caution (fixed in GitLab >= 12.7): when this option is enabled it is possible due to a bug in GitLab that MRs with failing pipelines might still get merged.
-This is caused by a race condition in GitLab's Merge Request API - [read the corresponding issue](https://gitlab.com/gitlab-org/gitlab/issues/26293) for details.
-
## gitLabIgnoreApprovals
Ignore the default project level approval(s), so that Renovate bot can automerge its merge requests, without needing approval(s).
@@ -1677,6 +1665,16 @@ Add to this object if you wish to define rules that apply only to PRs that pin d
If enabled Renovate will pin Docker images by means of their SHA256 digest and not only by tag so that they are immutable.
+## platformAutomerge
+
+If you have enabled `automerge` and set `automergeType=pr` in the Renovate config, then `platformAutomerge` is enabled by default to speed up merging via the platform's native automerge functionality.
+
+`platformAutomerge` will configure PRs to be merged after all (if any) branch policies have been met.
+This option is available for Azure and GitLab.
+It falls back to Renovate-based automerge if the platform-native automerge is not available.
+
+Though this option is enabled by default, you can fine tune the behavior by setting `packageRules` if you want to use it selectively (e.g. per-package).
+
## postUpdateOptions
- `gomodTidy`: Run `go mod tidy` after Go module updates. This is implicitly enabled for major module updates.
diff --git a/lib/config/migration.spec.ts b/lib/config/migration.spec.ts
index 4aa9d4625c0db689e1aa100d393f167ddcd03430..b725ec180f69feba91541b5ffb69272731d7b519 100644
--- a/lib/config/migration.spec.ts
+++ b/lib/config/migration.spec.ts
@@ -783,4 +783,54 @@ describe('config/migration', () => {
expect(isMigrated).toBe(true);
expect(migratedConfig).toMatchInlineSnapshot(`Object {}`);
});
+
+ it('migrates azureAutoComplete', () => {
+ const migrate = (config: RenovateConfig): MigratedConfig =>
+ configMigration.migrateConfig(config, defaultConfig);
+
+ expect(migrate({ azureAutoComplete: true })).toEqual({
+ isMigrated: true,
+ migratedConfig: { platformAutomerge: true },
+ });
+
+ expect(migrate({ azureAutoComplete: false })).toEqual({
+ isMigrated: true,
+ migratedConfig: { platformAutomerge: false },
+ });
+
+ expect(migrate({ automerge: false, azureAutoComplete: true })).toEqual({
+ isMigrated: true,
+ migratedConfig: { automerge: false, platformAutomerge: true },
+ });
+
+ expect(migrate({ automerge: true, azureAutoComplete: true })).toEqual({
+ isMigrated: true,
+ migratedConfig: { automerge: true, platformAutomerge: true },
+ });
+ });
+
+ it('migrates gitLabAutomerge', () => {
+ const migrate = (config: RenovateConfig): MigratedConfig =>
+ configMigration.migrateConfig(config, defaultConfig);
+
+ expect(migrate({ gitLabAutomerge: true })).toEqual({
+ isMigrated: true,
+ migratedConfig: { platformAutomerge: true },
+ });
+
+ expect(migrate({ gitLabAutomerge: false })).toEqual({
+ isMigrated: true,
+ migratedConfig: { platformAutomerge: false },
+ });
+
+ expect(migrate({ automerge: false, gitLabAutomerge: true })).toEqual({
+ isMigrated: true,
+ migratedConfig: { automerge: false, platformAutomerge: true },
+ });
+
+ expect(migrate({ automerge: true, gitLabAutomerge: true })).toEqual({
+ isMigrated: true,
+ migratedConfig: { automerge: true, platformAutomerge: true },
+ });
+ });
});
diff --git a/lib/config/migration.ts b/lib/config/migration.ts
index 1fb49fc3a3caa335b5052e65f6c3a941541c1870..81674078f06822ae9565ac7aedf4aff8bf8aa5c5 100644
--- a/lib/config/migration.ts
+++ b/lib/config/migration.ts
@@ -528,6 +528,11 @@ export function migrateConfig(
} else if (val === false) {
migratedConfig.composerIgnorePlatformReqs = null;
}
+ } else if (key === 'azureAutoComplete' || key === 'gitLabAutomerge') {
+ if (migratedConfig[key] !== undefined) {
+ migratedConfig.platformAutomerge = migratedConfig[key];
+ }
+ delete migratedConfig[key];
}
const migratedTemplates = {
fromVersion: 'currentVersion',
diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
index 5030ea0a24d2500fb305b71c950e1163ae9a4e55..e12d34a3addb119811639afcbbf02aea1e329018 100644
--- a/lib/config/options/index.ts
+++ b/lib/config/options/index.ts
@@ -752,13 +752,6 @@ const options: RenovateOptions[] = [
cli: false,
env: false,
},
- {
- name: 'azureAutoComplete',
- description:
- 'If set to true, Azure DevOps PRs will be set to auto-complete after all (if any) branch policies have been met.',
- type: 'boolean',
- default: false,
- },
{
name: 'azureWorkItemId',
description:
@@ -1910,12 +1903,6 @@ const options: RenovateOptions[] = [
type: 'boolean',
default: true,
},
- {
- name: 'gitLabAutomerge',
- description: `Enable or disable usage of GitLab's "merge when pipeline succeeds" feature when automerging MRs.`,
- type: 'boolean',
- default: false,
- },
{
name: 'gitLabIgnoreApprovals',
description: `Ignore approval rules for MRs created by Renovate, which is useful for automerge.`,
@@ -2083,6 +2070,12 @@ const options: RenovateOptions[] = [
globalOnly: true,
env: false,
},
+ {
+ name: 'platformAutomerge',
+ description: `Enable or disable usage of platform-native auto-merge capabilities when available.`,
+ type: 'boolean',
+ default: true,
+ },
];
export function getOptions(): RenovateOptions[] {
diff --git a/lib/platform/azure/index.spec.ts b/lib/platform/azure/index.spec.ts
index c117cd68729f10f0fd8ff98722bd7cc072f28258..e343b700ad182e6171b8b730c9e4ef1828c32e1d 100644
--- a/lib/platform/azure/index.spec.ts
+++ b/lib/platform/azure/index.spec.ts
@@ -652,7 +652,7 @@ describe('platform/azure/index', () => {
prTitle: 'The Title',
prBody: 'Hello world',
labels: ['deps', 'renovate'],
- platformOptions: { azureAutoComplete: true },
+ platformOptions: { usePlatformAutomerge: true },
});
expect(updateFn).toHaveBeenCalled();
expect(pr).toMatchSnapshot();
diff --git a/lib/platform/azure/index.ts b/lib/platform/azure/index.ts
index 9d19e3d2ef283b11690dc83efd60e3c55ff1895d..60185e64fb611919c3232b62ebd4929891220802 100644
--- a/lib/platform/azure/index.ts
+++ b/lib/platform/azure/index.ts
@@ -388,7 +388,7 @@ export async function createPr({
},
config.repoId
);
- if (platformOptions?.azureAutoComplete) {
+ if (platformOptions?.usePlatformAutomerge) {
pr = await azureApiGit.updatePullRequest(
{
autoCompleteSetBy: {
diff --git a/lib/platform/gitlab/index.spec.ts b/lib/platform/gitlab/index.spec.ts
index 6e847a727781d84db259c9d623861b5392700379..ab77b04d6f296f5f728b553045a621f8c053f897 100644
--- a/lib/platform/gitlab/index.spec.ts
+++ b/lib/platform/gitlab/index.spec.ts
@@ -1414,8 +1414,7 @@ describe('platform/gitlab/index', () => {
prBody: 'the-body',
labels: [],
platformOptions: {
- azureAutoComplete: false,
- gitLabAutomerge: true,
+ usePlatformAutomerge: true,
},
});
expect(httpMock.getTrace()).toMatchSnapshot();
@@ -1522,8 +1521,7 @@ describe('platform/gitlab/index', () => {
prBody: 'the-body',
labels: [],
platformOptions: {
- azureAutoComplete: false,
- gitLabAutomerge: true,
+ usePlatformAutomerge: true,
gitLabIgnoreApprovals: true,
},
});
@@ -1565,8 +1563,7 @@ describe('platform/gitlab/index', () => {
prBody: 'the-body',
labels: [],
platformOptions: {
- azureAutoComplete: false,
- gitLabAutomerge: true,
+ usePlatformAutomerge: true,
gitLabIgnoreApprovals: true,
},
});
@@ -1608,8 +1605,7 @@ describe('platform/gitlab/index', () => {
prBody: 'the-body',
labels: [],
platformOptions: {
- azureAutoComplete: false,
- gitLabAutomerge: true,
+ usePlatformAutomerge: true,
gitLabIgnoreApprovals: true,
},
});
diff --git a/lib/platform/gitlab/index.ts b/lib/platform/gitlab/index.ts
index 25ba11b2a0a9b24e245aef5f6f11b207d6f2f990..45d62902545a7b6e2ebca4cf702f406dec82357d 100644
--- a/lib/platform/gitlab/index.ts
+++ b/lib/platform/gitlab/index.ts
@@ -500,7 +500,7 @@ async function tryPrAutomerge(
pr: number,
platformOptions: PlatformPrOptions
): Promise<void> {
- if (platformOptions?.gitLabAutomerge) {
+ if (platformOptions?.usePlatformAutomerge) {
try {
if (platformOptions?.gitLabIgnoreApprovals) {
await ignoreApprovals(pr);
diff --git a/lib/platform/types.ts b/lib/platform/types.ts
index b371dc016b92e286df18b758111622738042ae39..3d0e7aaaaac66ead301107e779f5aaaea9f06676 100644
--- a/lib/platform/types.ts
+++ b/lib/platform/types.ts
@@ -78,11 +78,10 @@ export interface Issue {
}
export type PlatformPrOptions = {
azureAutoApprove?: boolean;
- azureAutoComplete?: boolean;
azureWorkItemId?: number;
bbUseDefaultReviewers?: boolean;
- gitLabAutomerge?: boolean;
gitLabIgnoreApprovals?: boolean;
+ usePlatformAutomerge?: boolean;
};
export interface CreatePRConfig {
sourceBranch: string;
diff --git a/lib/workers/global/config/parse/cli.spec.ts b/lib/workers/global/config/parse/cli.spec.ts
index fbce467a3c617b058825da05d02fc2cc1eff088e..76455df6f260f7c29235ef295b0c830024541a79 100644
--- a/lib/workers/global/config/parse/cli.spec.ts
+++ b/lib/workers/global/config/parse/cli.spec.ts
@@ -103,11 +103,18 @@ describe('workers/global/config/parse/cli', () => {
hostRules: [],
});
});
- it('migrates --endpoints', () => {
- argv.push(`--endpoints=`);
- expect(cli.getConfig(argv)).toEqual({
- hostRules: [],
- });
+ test.each`
+ arg | config
+ ${'--endpoints='} | ${{ hostRules: [] }}
+ ${'--azure-auto-complete=false'} | ${{ platformAutomerge: false }}
+ ${'--azure-auto-complete=true'} | ${{ platformAutomerge: true }}
+ ${'--azure-auto-complete'} | ${{ platformAutomerge: true }}
+ ${'--git-lab-automerge=false'} | ${{ platformAutomerge: false }}
+ ${'--git-lab-automerge=true'} | ${{ platformAutomerge: true }}
+ ${'--git-lab-automerge'} | ${{ platformAutomerge: true }}
+ `('"$arg" -> $config', ({ arg, config }) => {
+ argv.push(arg);
+ expect(cli.getConfig(argv)).toMatchObject(config);
});
it('parses json object correctly when empty', () => {
argv.push(`--onboarding-config=`);
diff --git a/lib/workers/global/config/parse/cli.ts b/lib/workers/global/config/parse/cli.ts
index 81632f4caf77b5bfd945b8100d37de0d3276ff70..1e224a736ed17e48a405911a7d411537460d470f 100644
--- a/lib/workers/global/config/parse/cli.ts
+++ b/lib/workers/global/config/parse/cli.ts
@@ -14,15 +14,18 @@ export function getCliName(option: Partial<RenovateOptions>): string {
export function getConfig(input: string[]): AllConfig {
// massage migrated configuration keys
const argv = input
- .map((a) =>
- a
- .replace('--endpoints=', '--host-rules=')
- .replace('--expose-env=true', '--trust-level=high')
- .replace('--expose-env', '--trust-level=high')
- .replace('--renovate-fork', '--include-forks')
- .replace('"platform":"', '"hostType":"')
- .replace('"endpoint":"', '"matchHost":"')
- .replace('"host":"', '"matchHost":"')
+ .map(
+ (a) =>
+ a
+ .replace('--endpoints=', '--host-rules=')
+ .replace('--expose-env=true', '--trust-level=high')
+ .replace('--expose-env', '--trust-level=high')
+ .replace('--renovate-fork', '--include-forks')
+ .replace('"platform":"', '"hostType":"')
+ .replace('"endpoint":"', '"matchHost":"')
+ .replace('"host":"', '"matchHost":"')
+ .replace('--azure-auto-complete', '--platform-automerge') // migrate: azureAutoComplete
+ .replace('--git-lab-automerge', '--platform-automerge') // migrate: gitLabAutomerge
)
.filter((a) => !a.startsWith('--git-fs'));
const options = getOptions();
diff --git a/lib/workers/global/config/parse/env.spec.ts b/lib/workers/global/config/parse/env.spec.ts
index 216be52a5989fcfd830f7ecb154f19f2181f8555..49ae1318c2d94edcdb1f937fbdc2893fbebae3e4 100644
--- a/lib/workers/global/config/parse/env.spec.ts
+++ b/lib/workers/global/config/parse/env.spec.ts
@@ -288,6 +288,15 @@ describe('workers/global/config/parse/env', () => {
expect(processExit).toHaveBeenCalledWith(1);
});
});
+ describe('migrations', () => {
+ it('renames migrated variables', () => {
+ const envParam: NodeJS.ProcessEnv = {
+ RENOVATE_GIT_LAB_AUTOMERGE: 'true',
+ };
+ const config = env.getConfig(envParam);
+ expect(config.platformAutomerge).toBe(true);
+ });
+ });
});
describe('.getEnvName(definition)', () => {
it('returns empty', () => {
diff --git a/lib/workers/global/config/parse/env.ts b/lib/workers/global/config/parse/env.ts
index 3425a5be8805913255cb0b9002a655f0b4045438..a27dd5bd379d54b6da9772c9c3676a724b7447ef 100644
--- a/lib/workers/global/config/parse/env.ts
+++ b/lib/workers/global/config/parse/env.ts
@@ -35,8 +35,28 @@ export function getEnvName(option: Partial<RenovateOptions>): string {
return `RENOVATE_${nameWithUnderscores.toUpperCase()}`;
}
+const renameKeys = {
+ azureAutoComplete: 'platformAutomerge', // migrate: azureAutoComplete
+ gitLabAutomerge: 'platformAutomerge', // migrate: gitLabAutomerge
+};
+
+function renameEnvKeys(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
+ const result = { ...env };
+ for (const [from, to] of Object.entries(renameKeys)) {
+ const fromKey = getEnvName({ name: from });
+ const toKey = getEnvName({ name: to });
+ if (env[fromKey]) {
+ result[toKey] = env[fromKey];
+ delete result[fromKey];
+ }
+ }
+ return result;
+}
+
export function getConfig(inputEnv: NodeJS.ProcessEnv): AllConfig {
- const env = normalizePrefixes(inputEnv, inputEnv.ENV_PREFIX);
+ let env = inputEnv;
+ env = normalizePrefixes(inputEnv, inputEnv.ENV_PREFIX);
+ env = renameEnvKeys(env);
const options = getOptions();
diff --git a/lib/workers/pr/__snapshots__/index.spec.ts.snap b/lib/workers/pr/__snapshots__/index.spec.ts.snap
index a7ae95855e90eca6edccde542fa62e9c8acc9257..65cfb688b1ddc7d1590aeaf73faef1087742479e 100644
--- a/lib/workers/pr/__snapshots__/index.spec.ts.snap
+++ b/lib/workers/pr/__snapshots__/index.spec.ts.snap
@@ -59,11 +59,10 @@ Array [
"labels": Array [],
"platformOptions": Object {
"azureAutoApprove": false,
- "azureAutoComplete": false,
"azureWorkItemId": 0,
"bbUseDefaultReviewers": true,
- "gitLabAutomerge": false,
"gitLabIgnoreApprovals": false,
+ "usePlatformAutomerge": false,
},
"prBody": "This PR contains the following updates:\\n\\n| Package | Type | Update | Change |\\n|---|---|---|---|\\n| [dummy](https://dummy.com) ([source](https://github.com/renovateapp/dummy), [changelog](https://github.com/renovateapp/dummy/changelog.md)) | devDependencies | pin | \`1.0.0\` -> \`1.1.0\` |\\n\\n📌 **Important**: Renovate will wait until you have merged this Pin PR before creating any *upgrade* PRs for the affected packages. Add the preset \`:preserveSemverRanges\` to your config if you instead don't wish to pin dependencies.\\n\\n---\\n\\n### Release Notes\\n\\n<details>\\n<summary>renovateapp/dummy</summary>\\n\\n### [\`v1.1.0\`](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n[Compare Source](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n</details>\\n\\n---\\n\\n### Configuration\\n\\n📅 **Schedule**: \\"before 5am\\" in timezone some timezone.\\n\\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\\n\\n♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.\\n\\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\\n\\n---\\n\\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\\n\\n---\\n\\nThis PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).",
"prTitle": "Update dependency dummy to v1.1.0",
@@ -93,11 +92,10 @@ Array [
"labels": Array [],
"platformOptions": Object {
"azureAutoApprove": false,
- "azureAutoComplete": false,
"azureWorkItemId": 0,
"bbUseDefaultReviewers": true,
- "gitLabAutomerge": false,
"gitLabIgnoreApprovals": false,
+ "usePlatformAutomerge": false,
},
"prBody": "This PR contains the following updates:\\n\\n| Package | Type | Update | Change |\\n|---|---|---|---|\\n| [dummy](https://dummy.com) ([source](https://github.com/renovateapp/dummy), [changelog](https://github.com/renovateapp/dummy/changelog.md)) | devDependencies | minor | \`1.0.0\` -> \`1.1.0\` |\\n\\n---\\n\\n### Release Notes\\n\\n<details>\\n<summary>renovateapp/dummy</summary>\\n\\n### [\`v1.1.0\`](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n[Compare Source](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n</details>\\n\\n---\\n\\n### Configuration\\n\\n📅 **Schedule**: \\"before 5am\\" (UTC).\\n\\n🚦 **Automerge**: Enabled.\\n\\n♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.\\n\\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\\n\\n---\\n\\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\\n\\n---\\n\\nThis PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).",
"prTitle": "Update dependency dummy to v1.1.0",
@@ -114,11 +112,10 @@ Array [
"labels": Array [],
"platformOptions": Object {
"azureAutoApprove": false,
- "azureAutoComplete": false,
"azureWorkItemId": 0,
"bbUseDefaultReviewers": true,
- "gitLabAutomerge": false,
"gitLabIgnoreApprovals": false,
+ "usePlatformAutomerge": false,
},
"prBody": "This PR contains the following updates:\\n\\n| Package | Type | Update | Change |\\n|---|---|---|---|\\n| [gitlabdummy](https://dummy.com) ([source](https://gitlab.com/renovateapp/gitlabdummy), [changelog](https://gitlab.com/renovateapp/gitlabdummy/changelog.md)) | devDependencies | minor | \`1.0.0\` -> \`1.1.0\` |\\n\\n---\\n\\n### Configuration\\n\\n📅 **Schedule**: \\"before 5am\\" (UTC).\\n\\n🚦 **Automerge**: Enabled.\\n\\n♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.\\n\\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\\n\\n---\\n\\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\\n\\n---\\n\\nThis PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).",
"prTitle": "Update dependency dummy to v1.1.0",
@@ -135,11 +132,10 @@ Array [
"labels": Array [],
"platformOptions": Object {
"azureAutoApprove": false,
- "azureAutoComplete": false,
"azureWorkItemId": 0,
"bbUseDefaultReviewers": true,
- "gitLabAutomerge": false,
"gitLabIgnoreApprovals": false,
+ "usePlatformAutomerge": false,
},
"prBody": "This PR contains the following updates:\\n\\n| Package | Type | Update | Change |\\n|---|---|---|---|\\n| [dummy](https://dummy.com) ([source](https://github.com/renovateapp/dummy), [changelog](https://github.com/renovateapp/dummy/changelog.md)) | devDependencies | lockFileMaintenance | \`1.0.0\` -> \`1.1.0\` |\\n| a | | | \`zzzzzz\` -> \`aaaaaaa\` |\\n| b | | pin | \`some_old_value\` -> \`some_new_value\` |\\n| c | | | \`\` -> \`\` |\\n| d | | lockFileMaintenance | \`\` -> \`\` |\\n\\nnote 1\\n\\nnote 2\\n\\n:warning: Release Notes retrieval for this PR were skipped because no github.com credentials were available.\\nIf you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/examples/self-hosting.md#githubcom-token-for-release-notes).\\n\\n🔡 If you wish to disable git hash updates, add \`\\":disableDigestUpdates\\"\` to the extends array in your config.\\n\\n🔧 This Pull Request updates lock files to use the latest dependency versions.\\n\\n---\\n\\n### Release Notes\\n\\n<details>\\n<summary>renovateapp/dummy</summary>\\n\\n### [\`v1.1.0\`](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n[Compare Source](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n</details>\\n\\n<details>\\n<summary>renovateapp/dummy</summary>\\n\\n</details>\\n\\n---\\n\\n### Configuration\\n\\n📅 **Schedule**: At any time (no schedule defined).\\n\\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\\n\\n♻ **Rebasing**: Never, or you tick the rebase/retry checkbox.\\n\\n👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired.\\n\\n---\\n\\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\\n\\n---\\n\\nThis PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).",
"prTitle": "Update dependency dummy to v1.1.0",
@@ -156,11 +152,10 @@ Array [
"labels": Array [],
"platformOptions": Object {
"azureAutoApprove": false,
- "azureAutoComplete": false,
"azureWorkItemId": 0,
"bbUseDefaultReviewers": true,
- "gitLabAutomerge": false,
"gitLabIgnoreApprovals": false,
+ "usePlatformAutomerge": false,
},
"prBody": "This PR contains the following updates:\\n\\n| Package | Type | Update | Change |\\n|---|---|---|---|\\n| [dummy](https://dummy.com) ([source](https://github.com/renovateapp/dummy), [changelog](https://github.com/renovateapp/dummy/changelog.md)) | devDependencies | minor | \`1.0.0\` -> \`1.1.0\` |\\n\\n---\\n\\n### Release Notes\\n\\n<details>\\n<summary>someproject</summary>\\n\\n### [\`v1.1.0\`](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n[Compare Source](https://github.com/renovateapp/dummy/compare/v1.0.0...v1.1.0)\\n\\n</details>\\n\\n---\\n\\n### Configuration\\n\\n📅 **Schedule**: At any time (no schedule defined).\\n\\n🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.\\n\\n♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.\\n\\n🔕 **Ignore**: Close this PR and you won't be reminded about this update again.\\n\\n---\\n\\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.\\n\\n---\\n\\nThis PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).",
"prTitle": "Update dependency dummy to v1.1.0",
diff --git a/lib/workers/pr/index.spec.ts b/lib/workers/pr/index.spec.ts
index 63e7ae7cab6f424d652c24c837ebbd962b24c680..488771cff25156e9b79d93e3f73232ed4b99468d 100644
--- a/lib/workers/pr/index.spec.ts
+++ b/lib/workers/pr/index.spec.ts
@@ -627,13 +627,13 @@ describe('workers/pr/index', () => {
});
it('should trigger GitLab automerge when configured', async () => {
- config.gitLabAutomerge = true;
+ config.usePlatformAutomerge = true;
config.gitLabIgnoreApprovals = true;
config.automerge = true;
await prWorker.ensurePr(config);
const args = platform.createPr.mock.calls[0];
expect(args[0].platformOptions).toMatchObject({
- gitLabAutomerge: true,
+ usePlatformAutomerge: true,
gitLabIgnoreApprovals: true,
});
});
diff --git a/lib/workers/pr/index.ts b/lib/workers/pr/index.ts
index d613bbcf95895a5f4289cb62db864a43a5f0b428..58a6cd9786b64730f86f18b68a9d9a2dbd8b0510 100644
--- a/lib/workers/pr/index.ts
+++ b/lib/workers/pr/index.ts
@@ -116,16 +116,18 @@ export async function addAssigneesReviewers(
export function getPlatformPrOptions(
config: RenovateConfig & PlatformPrOptions
): PlatformPrOptions {
+ const usePlatformAutomerge = Boolean(
+ config.automerge &&
+ config.automergeType === 'pr' &&
+ config.usePlatformAutomerge
+ );
+
return {
azureAutoApprove: config.azureAutoApprove,
- azureAutoComplete: config.azureAutoComplete,
azureWorkItemId: config.azureWorkItemId,
bbUseDefaultReviewers: config.bbUseDefaultReviewers,
- gitLabAutomerge:
- config.automerge &&
- config.automergeType === 'pr' &&
- config.gitLabAutomerge,
gitLabIgnoreApprovals: config.gitLabIgnoreApprovals,
+ usePlatformAutomerge,
};
}