From ef3e63dc89a9bfdced5e0876f96c785bfc95e95f Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Thu, 1 Jun 2023 16:13:55 -0700 Subject: [PATCH] Disable SBOM signing for CI and add extra files for packaging tests (#19729) --- .vsts-ci/windows/templates/windows-packaging.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml index 90655ee629..3961214c86 100644 --- a/.vsts-ci/windows/templates/windows-packaging.yml +++ b/.vsts-ci/windows/templates/windows-packaging.yml @@ -70,6 +70,7 @@ jobs: Build_Repository_Uri: $(build.repository.uri) displayName: SBOM sourceScanPath: '$(repoPath)\tools' + signSBOM: false # This is needed as SBOM task removed the installed .NET and installs .NET 3.1 - pwsh: | @@ -79,6 +80,18 @@ jobs: condition: succeeded() workingDirectory: $(repoPath) + - pwsh: | + $manifestFolder = Join-Path -Path '$(System.ArtifactsDirectory)/mainBuild' -ChildPath '_manifest' + + if (-not (Test-Path $manifestFolder)) { + throw "_manifest folder does not exist under $(System.ArtifactsDirectory)/mainBuild" + } + + $null = New-Item -Path "$manifestFolder/spdx_2.2/bsi.json" -Verbose -Force + $null = New-Item -Path "$manifestFolder/spdx_2.2/manifest.cat" -Verbose -Force + + displayName: Create fake SBOM manifest signed files + - pwsh: | Import-Module .\tools\ci.psm1 New-CodeCoverageAndTestPackage