From d203def3d084fa5cda15488af558524b47fbcf9b Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 5 Feb 2021 22:35:03 +0100
Subject: [PATCH] refactor: baseDir to global config
---
lib/config/common.ts | 2 +-
lib/config/definitions.ts | 2 +-
lib/workers/global/initialize.ts | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/config/common.ts b/lib/config/common.ts
index e2b3bc4da3..7f530514c7 100644
--- a/lib/config/common.ts
+++ b/lib/config/common.ts
@@ -68,6 +68,7 @@ export interface RenovateSharedConfig {
export interface GlobalAdminConfig {
autodiscover?: boolean;
autodiscoverFilter?: string;
+ baseDir?: string;
forceCli?: boolean;
gitPrivateKey?: string;
logFile?: string;
@@ -92,7 +93,6 @@ export interface RepoAdminConfig {
}
export interface RenovateAdminConfig {
- baseDir?: string;
cacheDir?: string;
customEnvVariables?: Record<string, string>;
diff --git a/lib/config/definitions.ts b/lib/config/definitions.ts
index f30e2df692..ac213365a6 100644
--- a/lib/config/definitions.ts
+++ b/lib/config/definitions.ts
@@ -298,7 +298,7 @@ const options: RenovateOptions[] = [
name: 'baseDir',
description:
'The base directory for Renovate to store local files, including repository files and cache. If left empty, Renovate will create its own temporary directory to use.',
- admin: true,
+ stage: 'global',
type: 'string',
},
{
diff --git a/lib/workers/global/initialize.ts b/lib/workers/global/initialize.ts
index 7eafa5e0c3..8f82e98d7e 100644
--- a/lib/workers/global/initialize.ts
+++ b/lib/workers/global/initialize.ts
@@ -1,15 +1,15 @@
import os from 'os';
import fs from 'fs-extra';
import upath from 'upath';
-import { RenovateConfig } from '../../config/common';
+import { GlobalConfig, RenovateConfig } from '../../config/common';
import { logger } from '../../logger';
import { initPlatform } from '../../platform';
import * as packageCache from '../../util/cache/package';
import { setEmojiConfig } from '../../util/emoji';
import { Limit, setMaxLimit } from './limits';
-async function setDirectories(input: RenovateConfig): Promise<RenovateConfig> {
- const config: RenovateConfig = { ...input };
+async function setDirectories(input: GlobalConfig): Promise<GlobalConfig> {
+ const config: GlobalConfig = { ...input };
process.env.TMPDIR = process.env.RENOVATE_TMPDIR || os.tmpdir();
if (config.baseDir) {
logger.debug('Using configured baseDir: ' + config.baseDir);
--
GitLab