Skip to content

Commit 6bad769

Browse files
authored
make sure publishing is the last thing in each pipeline (microsoft#187708)
this fixes a rare issue in which the second Generate SBOM task will fail, so a second attempt at running the pipeline will fail when publishing the first Publish SBOM task, since it would already have been published
1 parent ef9afc3 commit 6bad769

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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)

0 commit comments

Comments
 (0)