8000 Move SBOM steps to MSI and embed stages · python/release-tools@1d23d2d · GitHub
[go: up one dir, main page]
Skip to content

Commit 1d23d2d

Browse files
sethmlarsonsethmlarson
committed
Move SBOM steps to MSI and embed stages
1 parent 5306100 commit 1d23d2d

File tree

4 files changed

+46
-59
lines changed

4 files changed

+46
-59
lines changed

‎windows-release/azure-pipelines.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ stages:
147147
SigningCertificate: ${{ parameters.SigningCertificate }}
148148
DoFreethreaded: ${{ parameters.DoFreethreaded }}
149149

150-
- stage: SBOM
151-
displayName: Create SBOMs
152-
dependsOn: Build
153-
jobs:
154-
- template: stage-sbom.yml
155-
156150
- stage: Layout
157151
displayName: Generate layouts
158152
dependsOn: Sign

‎windows-release/msi-steps.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,26 @@ steps:
114114
- publish: '$(Build.ArtifactStagingDirectory)\msi'
115115
artifact: msi
116116
displayName: 'Publish MSI'
117+
118+
- powershell: >
119+
$(Python)
120+
"$(Build.SourcesDirectory)\sbom.py"
121+
"--cpython-source-dir=$(Build.SourcesDirectory)"
122+
$(gci -r "$(Build.ArtifactStagingDirectory)\msi\**\python-*.exe")
123+
workingDirectory: $(Build.BinariesDirectory)
124+
displayName: 'Create SBOMs for binaries'
125+
126+
- task: CopyFiles@2
127+
displayName: 'Layout Artifact: sbom'
128+
inputs:
129+
sourceFolder: $(Build.ArtifactStagingDirectory)\msi
130+
targetFolder: $(Build.ArtifactStagingDirectory)\sbom
131+
flatten: true
132+
contents: |
133+
**\*.spdx.json
134+
135+
- task: PublishBuildArtifacts@1
136+
displayName: 'Publish Artifact: sbom_msi_$(Name)'
137+
inputs:
138+
PathtoPublish: '$(Build.ArtifactStagingDirectory)\sbom'
139+
ArtifactName: sbom_msi_$(Name)

‎windows-release/stage-layout-embed.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,26 @@ jobs:
5555
inputs:
5656
PathtoPublish: '$(Build.ArtifactStagingDirectory)\embed'
5757
ArtifactName: embed
58+
59+
- powershell: >
60+
$(Python)
61+
"$(Build.SourcesDirectory)\sbom.py"
62+
"--cpython-source-dir=$(Build.SourcesDirectory)"
63+
"$(Build.ArtifactStagingDirectory)\embed\python-$(VersionText)-embed-$(Name).zip"
64+
workingDirectory: $(Build.BinariesDirectory)
65+
displayName: 'Create SBOMs for binaries'
66+
67+
- task: CopyFiles@2
68+
displayName: 'Layout Artifact: sbom'
69+
inputs:
70+
sourceFolder: $(Build.ArtifactStagingDirectory)\embed
71+
targetFolder: $(Build.ArtifactStagingDirectory)\sbom
72+
flatten: true
73+
contents: |
74+
**\*.spdx.json
75+
76+
- task: PublishBuildArtifacts@1
77+
displayName: 'Publish Artifact: sbom_embed_$(Name)'
78+
inputs:
79+
PathtoPublish: '$(Build.ArtifactStagingDirectory)\sbom'
80+
ArtifactName: sbom_embed_$(Name)

‎windows-release/stage-sbom.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.
< 328D /div>

0 commit comments

Comments
 (0)
0