Skip to content
Snippets Groups Projects
Unverified Commit 953101bf authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix: don’t force cli token or hostRules (#7303)

Closes #7298
parent 3e20d6f8
No related branches found
No related tags found
No related merge requests found
...@@ -65,10 +65,13 @@ export async function parseConfigs( ...@@ -65,10 +65,13 @@ export async function parseConfigs(
} }
if (config.forceCli) { if (config.forceCli) {
const forcedCli = { ...cliConfig };
delete forcedCli.token;
delete forcedCli.hostRules;
if (config.force) { if (config.force) {
config.force = Object.assign(config.force, { ...cliConfig }); config.force = Object.assign(config.force, forcedCli);
} else { } else {
config.force = { ...cliConfig }; config.force = forcedCli;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment