8000 Add SBOM for release pipeline (#20519) · PowerShell/PowerShell@faba49e · GitHub
[go: up one dir, main page]
Skip to content

Commit faba49e

Browse files
adityapatwardhanadityapatwardhan
authored
Add SBOM for release pipeline (#20519)
1 parent 6018075 commit faba49e

File tree

4 files changed

+30
-12
lines changed

4 files changed

+30
-12
lines changed

‎tools/releaseBuild/azureDevOps/releasePipeline.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ resources:
2929
name: Internal-PowerShellTeam-Tools
3030
ref: main-mirror
3131

32+
- repository: ComplianceRepo
33+
type: github
34+
endpoint: ComplianceGHRepo
35+
name: PowerShell/compliance
36+
ref: master
37+
3238
variables:
3339
- name: runCodesignValidationInjection
3440
value : false
@@ -341,7 +347,6 @@ stages:
341347
- stage: PublishPackages
342348
displayName: Publish packages
343349
dependsOn: GitHubManualTasks
344-
timeoutInMinutes: 120
345350
jobs:
346351
- job: PublishNuget
347352

‎tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@ steps:
77
- template: release-SetReleaseTagAndContainerName.yml
88

99
- pwsh: |
10-
Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
10+
Import-module '$(BUILD.SOURCESDIRECTORY)/PowerShell/build.psm1'
1111
Install-AzCopy
1212
displayName: Install AzCopy
1313
retryCountOnTaskFailure: 2
1414

1515
- pwsh: |
16-
Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
16+
Import-module '$(BUILD.SOURCESDIRECTORY)/PowerShell/build.psm1'
1717
$azcopy = Find-AzCopy
1818
Write-Verbose -Verbose "Found AzCopy: $azcopy"
1919
20-
& $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
2120
& $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --recursive
2221
2322
$packagesPath = Get-ChildItem -Path $(System.ArtifactsDirectory)\*.deb -Recurse -File | Select-Object -First 1 -ExpandProperty DirectoryName
@@ -27,7 +26,7 @@ steps:
2726
displayName: Download Azure Artifacts
2827
retryCountOnTaskFailure: 2
2928
env:
30-
AZCOPY_SPA_CLIENT_SECRET: $(PowerShellReleaseSPNSecret)
29+
AZCOPY_AUTO_LOGIN_TYPE: MSI
3130

3231
- pwsh: |
3332
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty FullName
@@ -55,6 +54,24 @@ steps:
5554
Write-Verbose -Verbose -Message $fileContent
5655
displayName: Add sha256 hashes
5756

57+
- checkout: ComplianceRepo
58+
59+
- pwsh: |
60+
$releaseVersion = '$(ReleaseTag)' -replace '^v',''
61+
$vstsCommandString = "vso[task.setvariable variable=ReleaseVersion]$releaseVersion"
62+
Write-Host "sending " + $vstsCommandString
63+
Write-Host "##$vstsCommandString"
64+
displayName: 'Set release version'
65+
66+
- template: Sbom.yml@ComplianceRepo
67+
parameters:
68+
BuildDropPath: '$(PackagesRoot)'
69+
Build_Repository_Uri: 'https://github.com/powershell/powershell.git'
70+
displayName: PowerShell Hashes SBOM
71+
packageName: PowerShell Artifact Hashes
72+
packageVersion: $(ReleaseVersion)
73+
sourceScanPath: '$(PackagesRoot)'
74+
5875
- pwsh: |
5976
Import-module '$(Pipeline.Workspace)/tools/Scripts/GitHubRelease.psm1'
6077
$releaseVersion = '$(ReleaseTag)' -replace '^v',''
@@ -69,7 +86,7 @@ steps:
6986
$semanticVersion.Major.ToString() + "." + $semanticVersion.Minor.ToString() + ".md"
7087
}
7188
72-
$filePath = "$env:BUILD_SOURCESDIRECTORY/CHANGELOG/$fileName"
89+
$filePath = "$env:BUILD_SOURCESDIRECTORY/PowerShell/CHANGELOG/$fileName"
7390
Write-Verbose -Verbose "Selected Log file: $filePath"
7491
7592
if (-not (Test-Path $filePath)) {

‎tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ steps:
1616
$azcopy = Find-AzCopy
1717
Write-Verbose -Verbose "Found AzCopy: $azcopy"
1818
19-
& $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
20-
2119
& $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)/* $(System.ArtifactsDirectory) --recursive
2220
2321
displayName: Download Azure Artifacts
2422
env:
25-
AZCOPY_SPA_CLIENT_SECRET: $(PowerShellReleaseSPNSecret)
23+
AZCOPY_AUTO_LOGIN_TYPE: MSI
2624

2725
- pwsh: |
2826
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name

‎tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,13 @@ jobs:
3939
$azcopy = Find-AzCopy
4040
Write-Verbose -Verbose "Found AzCopy: $azcopy"
4141
42-
& $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
43-
4442
Write-Host "running: $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)/PowerShell-$(Version)-win-${{ parameters.architecture }}.zip $(System.ArtifactsDirectory)"
4543
4644
& $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)/PowerShell-$(Version)-win-${{ parameters.architecture }}.zip $(System.ArtifactsDirectory)
4745
displayName: 'Download Azure Artifacts'
4846
retryCountOnTaskFailure: 2
4947
env:
50-
AZCOPY_SPA_CLIENT_SECRET: $(PowerShellReleaseSPNSecret)
48+
AZCOPY_AUTO_LOGIN_TYPE: MSI
5149
5250
- pwsh: 'Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name'
5351
displayName: 'Capture Artifact Listing'

0 commit comments

Comments
 (0)
0