From df2a31c7f5d24d243d7d19e3d246c2cba8cf3c59 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 4 Feb 2021 12:14:34 +0100
Subject: [PATCH] fix: remove unused binarySource=auto (#8461)
---
lib/config/__snapshots__/migration.spec.ts.snap | 1 +
lib/config/definitions.ts | 6 +++---
lib/config/migration.spec.ts | 1 +
lib/config/migration.ts | 2 ++
lib/util/exec/common.ts | 1 -
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/config/__snapshots__/migration.spec.ts.snap b/lib/config/__snapshots__/migration.spec.ts.snap
index 5f31362308..c9ddeae2f7 100644
--- a/lib/config/__snapshots__/migration.spec.ts.snap
+++ b/lib/config/__snapshots__/migration.spec.ts.snap
@@ -84,6 +84,7 @@ Object {
"baseBranches": Array [
"next",
],
+ "binarySource": "global",
"branchName": "{{{branchPrefix}}}{{{additionalBranchPrefix}}}{{{branchTopic}}}",
"branchPrefix": "renovate/",
"commitMessage": "{{#if semanticCommitType}}{{semanticCommitType}}{{#if semanticCommitScope}}({{semanticCommitScope}}){{/if}}: {{/if}}some commit message",
diff --git a/lib/config/definitions.ts b/lib/config/definitions.ts
index ed47ba5713..0d05c16342 100644
--- a/lib/config/definitions.ts
+++ b/lib/config/definitions.ts
@@ -281,11 +281,11 @@ const options: RenovateOptions[] = [
{
name: 'binarySource',
description:
- 'Where to source binaries like `npm` and `yarn` from, choices are `auto`, `global` and `docker`.',
+ 'Controls whether third party tools like npm or Gradle are called directly, or via Docker sidecar containers.',
admin: true,
type: 'string',
- allowedValues: ['auto', 'global', 'docker'],
- default: 'auto',
+ allowedValues: ['global', 'docker'],
+ default: 'global',
},
{
name: 'redisUrl',
diff --git a/lib/config/migration.spec.ts b/lib/config/migration.spec.ts
index 7c1d16e4df..b100b13eda 100644
--- a/lib/config/migration.spec.ts
+++ b/lib/config/migration.spec.ts
@@ -39,6 +39,7 @@ describe('config/migration', () => {
suppressNotifications: ['lockFileErrors', 'prEditNotification'],
automerge: 'none' as never,
automergeMajor: false,
+ binarySource: 'auto',
automergeMinor: true,
automergePatch: true,
masterIssue: 'true',
diff --git a/lib/config/migration.ts b/lib/config/migration.ts
index 2ec9e9d5a9..82cd06f92f 100644
--- a/lib/config/migration.ts
+++ b/lib/config/migration.ts
@@ -509,6 +509,8 @@ export function migrateConfig(
migratedConfig.suppressNotifications || [];
migratedConfig.suppressNotifications.push('deprecationWarningIssues');
}
+ } else if (key === 'binarySource' && val === 'auto') {
+ migratedConfig.binarySource = 'global';
}
}
if (migratedConfig.endpoints) {
diff --git a/lib/util/exec/common.ts b/lib/util/exec/common.ts
index b3a4e4ff95..987fe5e081 100644
--- a/lib/util/exec/common.ts
+++ b/lib/util/exec/common.ts
@@ -7,7 +7,6 @@ import { promisify } from 'util';
export type Opt<T> = T | null | undefined;
export enum BinarySource {
- Auto = 'auto',
Docker = 'docker',
Global = 'global',
}
--
GitLab