Skip to content

Commit 6501a3b

Browse files
amungeramunger
authored
Merge branch 'main' into aamunger/notebookOutput
2 parents e68a34f + 1b29130 commit 6501a3b

File tree

253 files changed

+6312
-2315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+6312
-2315
lines changed

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"files.readonlyInclude": {
3737
"**/node_modules/**": true,
3838
"**/yarn.lock": true,
39+
"**/Cargo.lock": true,
3940
"src/vs/workbench/workbench.web.main.css": true,
4041
"src/vs/workbench/workbench.desktop.main.css": true,
4142
"src/vs/workbench/workbench.desktop.main.nls.js": true,

‎CodeQL.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ path_classifiers:
2121
- "out-build"
2222
- "out-vscode"
2323
- "**/out/**"
24+
25+
# The default behavior is to tag library code as `library`. Results are hidden
26+
# for library code. You can tag further files as being library code by adding them
27+
# to the `library` section.
28+
library:
29+
- "**/node_modules/**"

‎build/azure-pipelines/common/createAsset.js

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/azure-pipelines/common/createAsset.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@ async function main(): Promise<void> {
196196
};
197197

198198
const uploadPromises: Promise<void>[] = [];
199+
199200
if (await blobClient.exists()) {
200-
console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
201+
uploadPromises.push(Promise.reject(new Error(`Blob ${quality}, ${blobName} already exists, not publishing again.`)));
201202
} else {
202-
uploadPromises.push(retry(async () => {
203+
uploadPromises.push(retry(async (attempt) => {
204+
console.log(`Uploading blobs to Azure storage (attempt ${attempt})...`);
203205
await blobClient.uploadFile(filePath, blobOptions);
204206
console.log('Blob successfully uploaded to Azure storage.');
205207
}));
@@ -214,26 +216,25 @@ async function main(): Promise<void> {
214216
const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName);
215217

216218
if (await mooncakeBlobClient.exists()) {
217-
console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`);
219+
uploadPromises.push(Promise.reject(new Error(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`)));
218220
} else {
219-
uploadPromises.push(retry(async () => {
221+
uploadPromises.push(retry(async (attempt) => {
222+
console.log(`Uploading blobs to Mooncake Azure storage (attempt ${attempt})...`);
220223
await mooncakeBlobClient.uploadFile(filePath, blobOptions);
221224
console.log('Blob successfully uploaded to Mooncake Azure storage.');
222225
}));
223226
}
227+
}
224228

225-
if (uploadPromises.length) {
226-
console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
227-
}
228-
} else {
229-
if (uploadPromises.length) {
230-
console.log('Uploading blobs to Azure storage...');
229+
const promiseResults = await Promise.allSettled(uploadPromises);
230+
231+
for (const result of promiseResults) {
232+
if (result.status === 'rejected') {
233+
throw result.reason;
231234
}
232235
}
233236

234-
await Promise.all(uploadPromises);
235-
236-
console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.');
237+
console.log('All blobs successfully uploaded.');
237238

238239
const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`;
239240
const blobPath = new URL(assetUrl).pathname;

‎build/azure-pipelines/common/retry.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/azure-pipelines/common/retry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
export async function retry<T>(fn: () => Promise<T>): Promise<T> {
6+
export async function retry<T>(fn: (attempt: number) => Promise<T>): Promise<T> {
77
let lastError: Error | undefined;
88

99
for (let run = 1; run <= 10; run++) {
1010
try {
11-
return await fn();
11+
return await fn(run);
1212
} catch (err) {
1313
if (!/ECONNRESET|CredentialUnavailableError|Audience validation failed/i.test(err.message)) {
1414
throw err;

‎build/azure-pipelines/darwin/product-build-darwin.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,16 @@ steps:
212212
BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
213213
PackageName: Visual Studio Code
214214

215-
- publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
216-
displayName: Publish SBOM (client)
217-
artifact: $(ARTIFACT_PREFIX)sbom_client_darwin_$(VSCODE_ARCH)_sbom
218-
219215
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
220216
displayName: Generate SBOM (server)
221217
inputs:
222218
BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
223219
PackageName: Visual Studio Code Server
224220

221+
- publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
222+
displayName: Publish SBOM (client)
223+
artifact: $(ARTIFACT_PREFIX)sbom_client_darwin_$(VSCODE_ARCH)_sbom
224+
225225
- publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
226226
displayName: Publish SBOM (server)
227227
artifact: $(ARTIFACT_PREFIX)sbom_server_darwin_$(VSCODE_ARCH)_sbom

‎build/azure-pipelines/linux/product-build-linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,16 @@ steps:
290290
BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
291291
PackageName: Visual Studio Code
292292

293-
- publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
294-
displayName: Publish SBOM (client)
295-
artifact: $(ARTIFACT_PREFIX)sbom_vscode_client_linux_$(VSCODE_ARCH)
296-
297293
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
298294
displayName: Generate SBOM (server)
299295
inputs:
300296
BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
301297
PackageName: Visual Studio Code Server
302298

299+
- publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
300+
displayName: Publish SBOM (client)
301+
artifact: $(ARTIFACT_PREFIX)sbom_vscode_client_linux_$(VSCODE_ARCH)
302+
303303
- publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
304304
displayName: Publish SBOM (server)
305305
artifact: $(ARTIFACT_PREFIX)sbom_vscode_server_linux_$(VSCODE_ARCH)

‎build/azure-pipelines/win32/product-build-win32.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ steps:
263263
$ErrorActionPreference = "Stop"
264264
$ArchivePath = ".build\win32-$(VSCODE_ARCH)\vscode-server-win32-$(VSCODE_ARCH).zip"
265265
New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force
266-
exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH)\* -r }
266+
exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH) -r }
267267
echo "##vso[task.setvariable variable=SERVER_PATH]$ArchivePath"
268268
condition: and(succeededOrFailed(), eq(variables['BUILT_SERVER'], 'true'))
269269
displayName: Package server
@@ -273,7 +273,7 @@ steps:
273273
$ErrorActionPreference = "Stop"
274274
$ArchivePath = ".build\win32-$(VSCODE_ARCH)\vscode-server-win32-$(VSCODE_ARCH)-web.zip"
275275
New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force
276-
exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH)-web\* -r }
276+
exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH)-web -r }
277277
echo "##vso[task.setvariable variable=WEB_PATH]$ArchivePath"
278278
condition: and(succeededOrFailed(), eq(variables['BUILT_WEB'], 'true'))
279279
displayName: Package server (web)
@@ -312,17 +312,17 @@ steps:
312312
BuildDropPath: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)
313313
PackageName: Visual Studio Code
314314

315-
- publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest
316-
displayName: Publish SBOM (client)
317-
artifact: $(ARTIFACT_PREFIX)sbom_client_win32_$(VSCODE_ARCH)
318-
319315
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
320316
displayName: Generate SBOM (server)
321317
inputs:
322318
BuildDropPath: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)
323319
PackageName: Visual Studio Code Server
324320
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
325321

322+
- publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest
323+
displayName: Publish SBOM (client)
324+
artifact: $(ARTIFACT_PREFIX)sbom_client_win32_$(VSCODE_ARCH)
325+
326326
- publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest
327327
displayName: Publish SBOM (server)
328328
artifact: $(ARTIFACT_PREFIX)sbom_server_win32_$(VSCODE_ARCH)

‎build/filters.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ module.exports.unicodeFilter = [
3232
'**',
3333

3434
'!**/ThirdPartyNotices.txt',
35+
'!**/ThirdPartyNotices.cli.txt',
3536
'!**/LICENSE.{txt,rtf}',
3637
'!LICENSES.chromium.html',
3738
'!**/LICENSE',
@@ -65,6 +66,7 @@ module.exports.indentationFilter = [
6566

6667
// except specific files
6768
'!**/ThirdPartyNotices.txt',
69+
'!**/ThirdPartyNotices.cli.txt',
6870
'!**/LICENSE.{txt,rtf}',
6971
'!LICENSES.chromium.html',
7072
'!**/LICENSE',

0 commit comments

Comments
 (0)