smoke: fix vscode-test cache location

This commit is contained in:
João Moreno 2021-07-16 15:23:41 +02:00
parent b8205f2aa4
commit 132e3783d0
No known key found for this signature in database
GPG key ID: 896B853774D1A575
4 changed files with 11 additions and 7 deletions

View file

@ -7,4 +7,3 @@ keybindings.*.json
test_data/
src/vscode/driver.d.ts
vscode-server*/
.vscode-test

View file

@ -28,7 +28,7 @@
"strip-json-comments": "^2.0.1",
"tmp": "0.0.33",
"typescript": "^4.3.2",
"vscode-test": "^1.5.2",
"vscode-test": "^1.6.1",
"watch": "^1.0.2"
}
}

View file

@ -6,6 +6,7 @@
import * as fs from 'fs';
import * as cp from 'child_process';
import * as path from 'path';
import * as os from 'os';
import * as minimist from 'minimist';
import * as tmp from 'tmp';
import * as rimraf from 'rimraf';
@ -247,7 +248,11 @@ async function ensureStableCode(): Promise<void> {
console.log(`*** Found VS Code v${version}, downloading previous VS Code version ${previousVersion.version}...`);
const stableCodeExecutable = await vscodetest.downloadAndUnzipVSCode(previousVersion.version);
const stableCodeExecutable = await vscodetest.download({
cachePath: path.join(os.tmpdir(), 'vscode-test'),
version: previousVersion.version
});
if (process.platform === 'darwin') {
// Visual Studio Code.app/Contents/MacOS/Electron
stableCodePath = path.dirname(path.dirname(path.dirname(stableCodeExecutable)));

View file

@ -932,10 +932,10 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
vscode-test@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-1.5.2.tgz#d9ec3cab1815afae1d7d81923e3c685d13d32303"
integrity sha512-x9PVfKxF6EInH9iSFGQi0V8H5zIW1fC7RAer6yNQR6sy3WyOwlWkuT3I+wf75xW/cO53hxMi1aj/EvqQfDFOAg==
vscode-test@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-1.6.1.tgz#44254c67036de92b00fdd72f6ace5f1854e1a563"
integrity sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==
dependencies:
http-proxy-agent "^4.0.1"
https-proxy-agent "^5.0.0"