aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvsrs <[email protected]>2020-07-03 12:56:30 +0100
committervsrs <[email protected]>2020-07-03 12:56:30 +0100
commitbebbfa1a29062a3e9304c80080316d8c4937e5bc (patch)
tree54cdbd2844f8147e55d7ec66131b71509ca03c7b
parent611fad275fb7f3c2ec018b5539444b6649285228 (diff)
Fix workspaceRoot
-rw-r--r--editors/code/src/run.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts
index c09954614..de68f27ae 100644
--- a/editors/code/src/run.ts
+++ b/editors/code/src/run.ts
@@ -103,6 +103,8 @@ export function prepareEnv(runnable: ra.Runnable, runnableEnvCfg: RunnableEnvCfg
103 env["UPDATE_EXPECT"] = "1"; 103 env["UPDATE_EXPECT"] = "1";
104 } 104 }
105 105
106 Object.assign(env, process.env as { [key: string]: string });
107
106 if (runnableEnvCfg) { 108 if (runnableEnvCfg) {
107 if (Array.isArray(runnableEnvCfg)) { 109 if (Array.isArray(runnableEnvCfg)) {
108 for (const it of runnableEnvCfg) { 110 for (const it of runnableEnvCfg) {
@@ -135,7 +137,7 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
135 type: tasks.TASK_TYPE, 137 type: tasks.TASK_TYPE,
136 command: args[0], // run, test, etc... 138 command: args[0], // run, test, etc...
137 args: args.slice(1), 139 args: args.slice(1),
138 cwd: runnable.args.workspaceRoot, 140 cwd: runnable.args.workspaceRoot || ".",
139 env: prepareEnv(runnable, config.runnableEnv), 141 env: prepareEnv(runnable, config.runnableEnv),
140 }; 142 };
141 143