Fix cwd after unknown change (#501)

* Something changed in VSCode recently
ChristopherHX · Jan 6, 2025 · 0c03a43 · 0c03a43
1 parent 4b87ad9
commit 0c03a43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/runner-server-vscode/index.ts b/src/runner-server-vscode/index.ts
@@ -218,7 +218,7 @@ function activate(context : ExtensionContext) {
 				args.push('--server', address)
 			}
 
-			let startproc = spawn(dotnetPath, args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env } });
+			let startproc = spawn(dotnetPath, args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env }, cwd: workspace.getWorkspaceFolder(Uri.parse(workflow))?.uri?.fsPath });
 			startproc.stdout.on('data', async (data) => {
 				var sdata = data.asciiSlice();
 				console.log(sdata)
@@ -252,7 +252,7 @@ function activate(context : ExtensionContext) {
 				args.push('--server', address)
 			}
 
-			let startproc = spawn(dotnetPath, args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env } });
+			let startproc = spawn(dotnetPath, args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env }, cwd: workspace.getWorkspaceFolder(Uri.parse(workflow))?.uri?.fsPath });
 			startproc.stdout.on('data', async (data) => {
 				var sdata = data.asciiSlice();
 				console.log(sdata)

diff --git a/src/runner-server-web-vscode/client/src/browserClientMain.ts b/src/runner-server-web-vscode/client/src/browserClientMain.ts
@@ -34,7 +34,7 @@ export async function activate(context: ExtensionContext) {
 		var sel : string = events.length === 1 ? events : await window.showQuickPick(events, { canPickMany: false })
 		var args = ['--event', sel || 'push', '-W', Uri.parse(workflow).fsPath ];
 
-		let startproc = spawn('Runner.Client', args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env, FORCE_COLOR: "1" } });
+		let startproc = spawn('Runner.Client', args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env, FORCE_COLOR: "1" }, cwd: workspace.getWorkspaceFolder(Uri.parse(workflow))?.uri?.fsPath });
 		startproc.stdout.on('data', async (data) => {
 			var sdata = data.asciiSlice();
 			writeEmitter.fire(sdata.replace(/\r?\n/g, "\r\n"));
@@ -80,7 +80,7 @@ export async function activate(context: ExtensionContext) {
 		var sel : string = events.length === 1 ? events : await window.showQuickPick(events, { canPickMany: false })
 		var args = [ '--event', sel || 'push', '-W', Uri.parse(workflow).fsPath, '-j', job ];
 
-		let startproc = spawn('Runner.Client', args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env, FORCE_COLOR: "1" } });
+		let startproc = spawn('Runner.Client', args, { windowsHide: true, stdio: 'pipe', shell: false, env: { ...process.env, FORCE_COLOR: "1" }, cwd: workspace.getWorkspaceFolder(Uri.parse(workflow))?.uri?.fsPath });
 		startproc.stdout.on('data', async (data) => {
 			var sdata = data.asciiSlice();
 			writeEmitter.fire(sdata.replace(/\r?\n/g, "\r\n"));