Skip to content

Commit 4336a74

Browse files
committed
Add conditions to the SBOM tasks
1 parent 432349e commit 4336a74

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -346,21 +346,21 @@ steps:
346346
inputs:
347347
BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
348348
PackageName: Visual Studio Code
349-
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
349+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'universal'))
350350

351351
- publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
352352
displayName: Publish SBOM (client)
353353
artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
354-
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
354+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'universal'))
355355

356356
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
357357
displayName: Generate SBOM (server)
358358
inputs:
359359
BuildDropPath: $(agent.builddirectory)/vscode-server-darwin
360360
PackageName: Visual Studio Code Server
361-
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
361+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))
362362

363363
- publish: $(agent.builddirectory)/vscode-server-darwin/_manifest
364364
displayName: Publish SBOM (server)
365365
artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
366-
condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
366+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), eq(variables['VSCODE_ARCH'], 'x64'))

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

+4
Original file line numberDiff line numberDiff line change
@@ -363,17 +363,21 @@ steps:
363363
inputs:
364364
BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
365365
PackageName: Visual Studio Code
366+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
366367

367368
- publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
368369
displayName: Publish SBOM (client)
369370
artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom
371+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
370372

371373
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
372374
displayName: Generate SBOM (server)
373375
inputs:
374376
BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
375377
PackageName: Visual Studio Code Server
378+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
376379

377380
- publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
378381
displayName: Publish SBOM (server)
379382
artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom
383+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -358,19 +358,21 @@ steps:
358358
inputs:
359359
BuildDropPath: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)
360360
PackageName: Visual Studio Code
361+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
361362

362363
- publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest
363364
displayName: Publish SBOM (client)
364365
artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom
366+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
365367

366368
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
367369
displayName: Generate SBOM (server)
368370
inputs:
369-
BuildDropPath: $(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)
371+
BuildDropPath: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)
370372
PackageName: Visual Studio Code Server
371-
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
373+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
372374

373-
- publish: $(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)/_manifest
375+
- publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest
374376
displayName: Publish SBOM (server)
375377
artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom
376-
condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
378+
condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))

0 commit comments

Comments
 (0)