8000 Add SBOMs generation for Windows artifacts by sethmlarson · Pull Request #100 · python/release-tools · GitHub
[go: up one dir, main page]
Skip to content

Add SBOMs generation for Windows artifacts #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 10, 2024
Merged

Add SBOMs generation for Windows artifacts #100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0767df7
Start of Windows artifact SBOMs
sethmlarson Feb 22, 2024
0cc5769
Address review feedback
sethmlarson Feb 23, 2024
2af8c58
Deduplicate top-level and CPython SBOM generation steps
sethmlarson Feb 23, 2024
06842ad
Add test cases for base CPython SBOM generation
sethmlarson Feb 23, 2024
5306100
Add --cpython-source-dir option
sethmlarson Feb 26, 2024
1d23d2d
Move SBOM steps to MSI and embed stages
sethmlarson Apr 4, 2024
c01765d
Move all publishing steps to the end of jobs
sethmlarson Apr 5, 2024
04ee7a6
Checkout release-tools manually, remove quotes
sethmlarson Apr 8, 2024
e9c9391
Also clone in msi-steps job, fix multi-command character
sethmlarson Apr 8, 2024
8cb1ff1
Use '$(Build.SourceBranchName)'
sethmlarson Apr 8, 2024
b436169
Attempt to flatten all SBOM artifacts to one bucket
sethmlarson Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move SBOM steps to MSI and embed stages
  • Loading branch information
@sethmlarson
sethmlarson committed Apr 4, 2024
commit 1d23d2da532a389877b86a6c88ad5f29838bcb26
6 changes: 0 additions & 6 deletions windows-release/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,6 @@ stages:
SigningCertificate: ${{ parameters.SigningCertificate }}
DoFreethreaded: ${{ parameters.DoFreethreaded }}

- stage: SBOM
displayName: Create SBOMs
dependsOn: Build
jobs:
- template: stage-sbom.yml

- stage: Layout
displayName: Generate layouts
dependsOn: Sign
Expand Down
23 changes: 23 additions & 0 deletions windows-release/msi-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,26 @@ steps:
- publish: '$(Build.ArtifactStagingDirectory)\msi'
artifact: msi
displayName: 'Publish MSI'

- powershell: >
$(Python)
"$(Build.SourcesDirectory)\sbom.py"
"--cpython-source-dir=$(Build.SourcesDirectory)"
$(gci -r "$(Build.ArtifactStagingDirectory)\msi\**\python-*.exe")
workingDirectory: $(Build.BinariesDirectory)
displayName: 'Create SBOMs for binaries'

- task: CopyFiles@2
displayName: 'Layout Artifact: sbom'
inputs:
sourceFolder: $(Build.ArtifactStagingDirectory)\msi
targetFolder: $(Build.ArtifactStagingDirectory)\sbom
flatten: true
contents: |
**\*.spdx.json

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: sbom_msi_$(Name)'
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)\sbom'
ArtifactName: sbom_msi_$(Name)
23 changes: 23 additions & 0 deletions windows-release/stage-layout-embed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,26 @@ jobs:
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)\embed'
ArtifactName: embed

- powershell: >
$(Python)
"$(Build.SourcesDirectory)\sbom.py"
"--cpython-source-dir=$(Build.SourcesDirectory)"
"$(Build.ArtifactStagingDirectory)\embed\python-$(VersionText)-embed-$(Name).zip"
workingDirectory: $(Build.BinariesDirectory)
displayName: 'Create SBOMs for binaries'

- task: CopyFiles@2
displayName: 'Layout Artifact: sbom'
inputs:
sourceFolder: $(Build.ArtifactStagingDirectory)\embed
targetFolder: $(Build.ArtifactStagingDirectory)\sbom
flatten: true
contents: |
**\*.spdx.json

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: sbom_embed_$(Name)'
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)\sbom'
ArtifactName: sbom_embed_$(Name)
53 changes: 0 additions & 53 deletions windows-release/stage-sbom.yml
View file
Open in desktop

This file was deleted.

0