From e7506fefa5911cb186d554418aeb7bbe439caa3d Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 19 May 2021 12:27:57 +0200
Subject: [PATCH] fix: post upgrade commands localDir
---
lib/workers/branch/execute-post-upgrade-commands.ts | 2 +-
lib/workers/branch/index.spec.ts | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/workers/branch/execute-post-upgrade-commands.ts b/lib/workers/branch/execute-post-upgrade-commands.ts
index 1476dbf3b4..9e67efc305 100644
--- a/lib/workers/branch/execute-post-upgrade-commands.ts
+++ b/lib/workers/branch/execute-post-upgrade-commands.ts
@@ -62,7 +62,7 @@ export async function postUpgradeCommandsExecutor(
logger.debug({ cmd: compiledCmd }, 'Executing post-upgrade task');
const execResult = await exec(compiledCmd, {
- cwd: config.localDir,
+ cwd: getAdminConfig().localDir,
});
logger.debug(
diff --git a/lib/workers/branch/index.spec.ts b/lib/workers/branch/index.spec.ts
index f3157d3158..dc348e8214 100644
--- a/lib/workers/branch/index.spec.ts
+++ b/lib/workers/branch/index.spec.ts
@@ -781,6 +781,7 @@ describe(getName(), () => {
allowedPostUpgradeCommands: ['^echo {{{versioning}}}$'],
allowPostUpgradeCommandTemplating: true,
exposeAllEnv: true,
+ localDir: '/localDir',
});
const result = await branchWorker.processBranch({
@@ -790,7 +791,6 @@ describe(getName(), () => {
commands: ['echo {{{versioning}}}', 'disallowed task'],
fileFilters: ['modified_file', 'deleted_file'],
},
- localDir: '/localDir',
upgrades: [
{
...defaultConfig,
@@ -861,13 +861,13 @@ describe(getName(), () => {
allowedPostUpgradeCommands: ['^exit 1$'],
allowPostUpgradeCommandTemplating: true,
exposeAllEnv: true,
+ localDir: '/localDir',
});
exec.exec.mockRejectedValue(new Error('Meh, this went wrong!'));
await branchWorker.processBranch({
...config,
- localDir: '/localDir',
upgrades: [
{
...defaultConfig,
@@ -930,6 +930,7 @@ describe(getName(), () => {
allowedPostUpgradeCommands: ['^echo {{{versioning}}}$'],
allowPostUpgradeCommandTemplating: false,
exposeAllEnv: true,
+ localDir: '/localDir',
});
const result = await branchWorker.processBranch({
...config,
@@ -938,7 +939,6 @@ describe(getName(), () => {
commands: ['echo {{{versioning}}}', 'disallowed task'],
fileFilters: ['modified_file', 'deleted_file'],
},
- localDir: '/localDir',
upgrades: [
{
...defaultConfig,
@@ -1010,6 +1010,7 @@ describe(getName(), () => {
allowedPostUpgradeCommands: ['^echo {{{depName}}}$'],
allowPostUpgradeCommandTemplating: true,
exposeAllEnv: true,
+ localDir: '/localDir',
});
const inconfig: BranchConfig = {
@@ -1024,7 +1025,6 @@ describe(getName(), () => {
'modified_then_deleted_file',
],
},
- localDir: '/localDir',
upgrades: [
{
...defaultConfig,
@@ -1144,6 +1144,7 @@ describe(getName(), () => {
allowedPostUpgradeCommands: ['^echo hardcoded-string$'],
allowPostUpgradeCommandTemplating: true,
trustLevel: 'high',
+ localDir: '/localDir',
});
const inconfig: BranchConfig = {
@@ -1158,7 +1159,6 @@ describe(getName(), () => {
'modified_then_deleted_file',
],
},
- localDir: '/localDir',
upgrades: [
{
...defaultConfig,
--
GitLab