Skip to content

Commit dd68b3f

Browse files
meganroggemeganrogge
authored
Merge branch 'main' into merogge/fix-task-reconnection
2 parents d039e4a + ba4564b commit dd68b3f

File tree

42 files changed

+735
-641
lines changed

Some content is hidden

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

42 files changed

+735
-641
lines changed

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
"git",
136136
"sash"
137137
],
138+
"githubPullRequests.experimental.createView": true,
138139
"debug.javascript.terminalOptions": {
139140
"outFiles": [
140141
"${workspaceFolder}/out/**/*.js",

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,23 +128,27 @@ steps:
128128
GITHUB_TOKEN: "$(github-distro-mixin-password)"
129129
displayName: Build server (web)
130130
131+
- script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
132+
condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
133+
displayName: Generate artifact prefix
134+
131135
- publish: $(SERVER_PATH)
132-
artifact: vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned
136+
artifact: $(ARTIFACT_PREFIX)vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned
133137
displayName: Publish server archive
134138
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64'))
135139

136140
- publish: $(WEB_PATH)
137-
artifact: vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned
141+
artifact: $(ARTIFACT_PREFIX)vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned
138142
displayName: Publish web server archive
139143
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64'))
140144

141145
# Legacy x64 artifact name
142146
- publish: $(SERVER_PATH)
143-
artifact: vscode_server_linux_alpine_archive-unsigned
147+
artifact: $(ARTIFACT_PREFIX)vscode_server_linux_alpine_archive-unsigned
144148
displayName: Publish x64 server archive
145149
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64'))
146150

147151
- publish: $(WEB_PATH)
148-
artifact: vscode_web_linux_alpine_archive-unsigned
152+
artifact: $(ARTIFACT_PREFIX)vscode_web_linux_alpine_archive-unsigned
149153
displayName: Publish x64 web server archive
150154
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64'))

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ steps:
202202
condition: and(succeededOrFailed(), eq(variables['BUILT_CLIENT'], 'true'))
203203
displayName: Package client
204204
205+
- script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
206+
condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
207+
displayName: Generate artifact prefix
208+
205209
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
206210
displayName: Generate SBOM (client)
207211
inputs:
@@ -210,7 +214,7 @@ steps:
210214

211215
- publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
212216
displayName: Publish SBOM (client)
213-
artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
217+
artifact: $(ARTIFACT_PREFIX)sbom_client_darwin_$(VSCODE_ARCH)_sbom
214218

215219
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
216220
displayName: Generate SBOM (server)
@@ -220,19 +224,19 @@ steps:
220224

221225
- publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
222226
displayName: Publish SBOM (server)
223-
artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
227+
artifact: $(ARTIFACT_PREFIX)sbom_server_darwin_$(VSCODE_ARCH)_sbom
224228

225229
- publish: $(CLIENT_PATH)
226-
artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
230+
artifact: $(ARTIFACT_PREFIX)unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
227231
condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], ''))
228232
displayName: Publish client archive
229233

230234
- publish: $(SERVER_PATH)
231-
artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
235+
artifact: $(ARTIFACT_PREFIX)vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
232236
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
233237
displayName: Publish server archive
234238

235239
- publish: $(WEB_PATH)
236-
artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
240+
artifact: $(ARTIFACT_PREFIX)vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
237241
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
238242
displayName: Publish web server archive

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ steps:
235235
- ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
236236
- task: DownloadPipelineArtifact@2
237237
inputs:
238-
artifact: vscode_cli_linux_$(VSCODE_ARCH)_cli
238+
artifact: $(ARTIFACT_PREFIX)vscode_cli_linux_$(VSCODE_ARCH)_cli
239239
patterns: "**"
240240
path: $(Build.ArtifactStagingDirectory)/cli
241241
displayName: Download VS Code CLI
@@ -280,8 +280,9 @@ steps:
280280
- script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm'
281281
displayName: Codesign rpm
282282

283-
# - script: ./build/azure-pipelines/linux/prepare-publish.sh
284-
# displayName: Prepare for Publish
283+
- script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
284+
condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
285+
displayName: Generate artifact prefix
285286

286287
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
287288
displayName: Generate SBOM (client)
@@ -291,7 +292,7 @@ steps:
291292

292293
- publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
293294
displayName: Publish SBOM (client)
294-
artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom
295+
artifact: $(ARTIFACT_PREFIX)sbom_vscode_client_linux_$(VSCODE_ARCH)
295296

296297
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
297298
displayName: Generate SBOM (server)
@@ -301,35 +302,35 @@ steps:
301302

302303
- publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
303304
displayName: Publish SBOM (server)
304-
artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom
305+
artifact: $(ARTIFACT_PREFIX)sbom_vscode_server_linux_$(VSCODE_ARCH)
305306

306307
- publish: $(CLIENT_PATH)
307-
artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
308+
artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
308309
condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], ''))
309310
displayName: Publish client archive
310311

311312
- publish: $(SERVER_PATH)
312-
artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
313+
artifact: $(ARTIFACT_PREFIX)vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
313314
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
314315
displayName: Publish server archive
315316

316317
- publish: $(WEB_PATH)
317-
artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
318+
artifact: $(ARTIFACT_PREFIX)vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
318319
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
319320
displayName: Publish web server archive
320321

321322
- publish: $(DEB_PATH)
322-
artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package
323+
artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_deb-package
323324
condition: and(succeededOrFailed(), ne(variables['DEB_PATH'], ''))
324325
displayName: Publish deb package
325326

326327
- publish: $(RPM_PATH)
327-
artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package
328+
artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_rpm-package
328329
condition: and(succeededOrFailed(), ne(variables['RPM_PATH'], ''))
329330
displayName: Publish rpm package
330331

331332
- publish: $(SNAP_PATH)
332-
artifact: snap-$(VSCODE_ARCH)
333+
artifact: $(ARTIFACT_PREFIX)snap-$(VSCODE_ARCH)
333334
condition: and(succeededOrFailed(), ne(variables['SNAP_PATH'], ''))
334335
displayName: Publish snap pre-package
335336

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ variables:
136136
value: true
137137
- name: Codeql.SkipTaskAutoInjection
138138
value: true
139+
- name: ARTIFACT_PREFIX
140+
value: ''
139141

140142
name: "$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.VSCODE_QUALITY }})"
141143

@@ -346,9 +348,9 @@ stages:
346348
parameters:
347349
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
348350
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
349-
VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
350-
VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
351-
VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
351+
VSCODE_RUN_UNIT_TESTS: false
352+
VSCODE_RUN_INTEGRATION_TESTS: false
353+
VSCODE_RUN_SMOKE_TESTS: false
352354

353355
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
354356
- job: WindowsARM64

‎build/azure-pipelines/product-publish.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ do {
6060

6161
$artifacts | ForEach-Object {
6262
$artifactName = $_.name
63+
6364
if($set.Add($artifactName)) {
6465
Write-Host "Processing artifact: '$artifactName. Downloading from: $($_.resource.downloadUrl)"
6566

@@ -98,8 +99,11 @@ do {
9899
} | Format-Table
99100

100101
exec { node build/azure-pipelines/common/createAsset.js $product $os $arch $type $asset.Name $asset.FullName }
101-
$artifactName >> $ARTIFACT_PROCESSED_FILE_PATH
102102
}
103+
104+
# Mark the artifact as processed. Make sure to keep the previously
105+
# processed artifacts in the file as well, not just from this run.
106+
$artifactName >> $ARTIFACT_PROCESSED_FILE_PATH
103107
}
104108

105109
# Get the timeline and see if it says the other stage completed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,11 @@ steps:
139139
node build/azure-pipelines/upload-nlsmetadata
140140
displayName: Upload NLS Metadata
141141
142+
- script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
143+
condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
144+
displayName: Generate artifact prefix
145+
142146
- publish: $(WEB_PATH)
143-
artifact: vscode_web_linux_standalone_archive-unsigned
147+
artifact: $(ARTIFACT_PREFIX)vscode_web_linux_standalone_archive-unsigned
144148
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
145149
displayName: Publish web archive

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,10 @@ steps:
299299
echo "##vso[task.setvariable variable=USER_SETUP_PATH]$SetupPath"
300300
displayName: Build user setup
301301
302+
- powershell: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
303+
condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
304+
displayName: Generate artifact prefix
305+
302306
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
303307
displayName: Generate SBOM (client)
304308
inputs:
@@ -307,7 +311,7 @@ steps:
307311

308312
- publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest
309313
displayName: Publish SBOM (client)
310-
artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom
314+
artifact: $(ARTIFACT_PREFIX)sbom_client_win32_$(VSCODE_ARCH)
311315

312316
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
313317
displayName: Generate SBOM (server)
@@ -318,30 +322,30 @@ steps:
318322

319323
- publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest
320324
displayName: Publish SBOM (server)
321-
artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom
325+
artifact: $(ARTIFACT_PREFIX)sbom_server_win32_$(VSCODE_ARCH)
322326
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
323327

324328
- publish: $(CLIENT_PATH)
325-
artifact: vscode_client_win32_$(VSCODE_ARCH)_archive
329+
artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_archive
326330
condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], ''))
327331
displayName: Publish archive
328332

329333
- publish: $(SERVER_PATH)
330-
artifact: vscode_server_win32_$(VSCODE_ARCH)_archive
334+
artifact: $(ARTIFACT_PREFIX)vscode_server_win32_$(VSCODE_ARCH)_archive
331335
condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
332336
displayName: Publish server archive
333337

334338
- publish: $(WEB_PATH)
335-
artifact: vscode_web_win32_$(VSCODE_ARCH)_archive
339+
artifact: $(ARTIFACT_PREFIX)vscode_web_win32_$(VSCODE_ARCH)_archive
336340
condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
337341
displayName: Publish web server archive
338342

339343
- publish: $(SYSTEM_SETUP_PATH)
340-
artifact: vscode_client_win32_$(VSCODE_ARCH)_setup
344+
artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_setup
341345
condition: and(succeededOrFailed(), ne(variables['SYSTEM_SETUP_PATH'], ''))
342346
displayName: Publish system setup
343347

344348
- publish: $(USER_SETUP_PATH)
345-
artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup
349+
artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_user-setup
346350
condition: and(succeededOrFailed(), ne(variables['USER_SETUP_PATH'], ''))
347351
displayName: Publish user setup

‎cli/Cargo.lock

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

‎extensions/emmet/src/test/abbreviationAction.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
410410
// });
411411
// });
412412

413-
test('No expanding when html is excluded in the settings in completion list', async () => {
413+
test.skip('No expanding when html is excluded in the settings in completion list', async () => {
414414
const oldConfig = workspace.getConfiguration('emmet').inspect('excludeLanguages')?.globalValue;
415415
await workspace.getConfiguration('emmet').update('excludeLanguages', ['html'], ConfigurationTarget.Global);
416416
await testHtmlCompletionProvider(new Selection(9, 6, 9, 6), '', '', true);
@@ -469,7 +469,7 @@ suite('Tests for jsx, xml and xsl', () => {
469469
});
470470
});
471471

472-
test('Expand abbreviation with no self closing tags for html', () => {
472+
test.skip('Expand abbreviation with no self closing tags for html', () => {
473473
return withRandomFileEditor('img', 'html', async (editor, _doc) => {
474474
editor.selection = new Selection(0, 6, 0, 6);
475475
await expandEmmetAbbreviation({ language: 'html' });

0 commit comments

Comments
 (0)