Skip to content

Commit

Permalink
Merge pull request #228 from microsoft/connor4312/2.3.4
Browse files Browse the repository at this point in the history
v2.3.4
  • Loading branch information
connor4312 authored Jul 31, 2023
2 parents d1668ff + 17df8e1 commit 4becb98
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### 2.3.4 | 2022-07-31

- Fix "insiders" string not matching correctly

### 2.3.3 | 2022-06-10

- Disable GPU sandbox by default, fixing failures in some CI's.
Expand Down
23 changes: 10 additions & 13 deletions lib/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ switch (process.platform) {
process.arch === 'arm64'
? 'win32-arm64-archive'
: process.arch === 'ia32'
? 'win32-archive'
: 'win32-x64-archive';
? 'win32-archive'
: 'win32-x64-archive';
break;
default:
systemDefaultPlatform =
Expand Down Expand Up @@ -242,19 +242,16 @@ export function killTree(processId: number, force: boolean) {

// when killing a process in Windows its child processes are *not* killed but become root processes.
// Therefore we use TASKKILL.EXE
cp = spawn(path.join(windir, 'System32', 'taskkill.exe'), [
...force ? ['/F'] : [],
'/T',
'/PID',
processId.toString(),
], { stdio: 'inherit' });
cp = spawn(
path.join(windir, 'System32', 'taskkill.exe'),
[...(force ? ['/F'] : []), '/T', '/PID', processId.toString()],
{ stdio: 'inherit' }
);
} else {
// on linux and OS X we kill all direct and indirect child processes as well
cp = spawn('sh', [
path.resolve(__dirname, '../killTree.sh'),
processId.toString(),
force ? '9' : '15',
], { stdio: 'inherit' });
cp = spawn('sh', [path.resolve(__dirname, '../killTree.sh'), processId.toString(), force ? '9' : '15'], {
stdio: 'inherit',
});
}

return new Promise<void>((resolve, reject) => {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vscode/test-electron",
"version": "2.3.3",
"version": "2.3.4",
"scripts": {
"compile": "tsc -p ./",
"watch": "tsc -w -p ./",
Expand Down

0 comments on commit 4becb98

Please sign in to comment.