Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .yarn/patches/@vscode-test-electron-npm-2.5.2-7b7f19ec88.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/out/download.js b/out/download.js
index 8395bb7f6f0085c6714f272ca0ab72cdec8a2fb5..7224b0c3b5bfbfb8537ddbdfe26478b176facd58 100644
--- a/out/download.js
+++ b/out/download.js
@@ -231,6 +231,9 @@ async function downloadVSCodeArchive(options) {
async function unzipVSCode(reporter, extractDir, platform, { format, stream, length, sha256 }) {
const stagingFile = path.join((0, os_1.tmpdir)(), `vscode-test-${Date.now()}.zip`);
const checksum = (0, util_2.validateStream)(stream, length, sha256);
+ // Backport of microsoft/vscode-test#340: `checksum` is only awaited on some
+ // paths, so a mid-download stream error otherwise crashes the process.
+ checksum.catch(() => { });
if (format === 'zip') {
const stripComponents = (0, util_2.isPlatformServer)(platform) ? 1 : 0;
try {
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"json5": "2.2.2",
"path-scurry": "^2.0.0",
"jws": "^4.0.1",
"@databricks/sdk-experimental@^0.18.0": "patch:@databricks/sdk-experimental@npm:0.18.0#.yarn/patches/@databricks-sdk-experimental-npm-0.18.0-eaa822207a.patch"
"@databricks/sdk-experimental@^0.18.0": "patch:@databricks/sdk-experimental@npm:0.18.0#.yarn/patches/@databricks-sdk-experimental-npm-0.18.0-eaa822207a.patch",
"@vscode/test-electron@^2.4.1": "patch:@vscode/test-electron@npm:2.5.2#.yarn/patches/@vscode-test-electron-npm-2.5.2-7b7f19ec88.patch"
}
}
15 changes: 14 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2138,7 +2138,7 @@ __metadata:
languageName: node
linkType: hard

"@vscode/test-electron@npm:^2.4.1":
"@vscode/test-electron@npm:2.5.2":
version: 2.5.2
resolution: "@vscode/test-electron@npm:2.5.2"
dependencies:
Expand All @@ -2164,6 +2164,19 @@ __metadata:
languageName: node
linkType: hard

"@vscode/test-electron@patch:@vscode/test-electron@npm:2.5.2#.yarn/patches/@vscode-test-electron-npm-2.5.2-7b7f19ec88.patch::locator=%40databricks%2Fdatabricks-vscode%40workspace%3A.":
version: 2.5.2
resolution: "@vscode/test-electron@patch:@vscode/test-electron@npm%3A2.5.2#.yarn/patches/@vscode-test-electron-npm-2.5.2-7b7f19ec88.patch::version=2.5.2&hash=7b74bd&locator=%40databricks%2Fdatabricks-vscode%40workspace%3A."
dependencies:
http-proxy-agent: ^7.0.2
https-proxy-agent: ^7.0.5
jszip: ^3.10.1
ora: ^8.1.0
semver: ^7.6.2
checksum: 94d69e5ef427945d8a06abef9773bcc215bf694fcfc966f6449048e6414c3500225b9e9b5b1a96730342ca776830534bdeb37ab691b9492cbdba9b391fad884f
languageName: node
linkType: hard

"@vscode/webview-ui-toolkit@npm:^1.4.0":
version: 1.4.0
resolution: "@vscode/webview-ui-toolkit@npm:1.4.0"
Expand Down
Loading