File tree Expand file tree Collapse file tree 2 files changed +13
-3
lines changed
Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -80,25 +80,34 @@ jobs:
8080
8181 steps :
8282 - name : Fetch Changelogs
83+ id : download-changelogs
8384 uses : actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v4
8485 with :
8586 pattern : changelog-*
8687 merge-multiple : true
8788 path : /tmp/changelogs
8889
90+ - name : Fetch SBOMs
91+ id : download-sbom
92+ uses : actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v4
93+ with :
94+ pattern : " *.spdx.json"
95+ merge-multiple : true
96+ path : /tmp/sboms
97+
8998 - name : Prepare Release
9099 id : prepare-release
91100 shell : bash
92101 run : |
93- if [[ ! -d /tmp/ changelogs ]]; then
102+ if [[ ! -d ${{ steps.download- changelogs.outputs.download-path }} ]]; then
94103 echo "No changelogs found, skipping release creation"
95104 echo "skip=1" >> "$GITHUB_ENV"
96105 exit
97106 fi
98107
99108 echo "Automated release for version \`${{ needs.build-test-promote.outputs.version }}\`." > ./changelog.md
100109
101- for changelog in /tmp/ changelogs/*.txt; do
110+ for changelog in ${{ steps.download- changelogs.outputs.download-path }} /*.txt; do
102111 # Remove empty Package Changes
103112 sed -i '/^#### Package Changes$/{
104113 N
@@ -127,3 +136,4 @@ jobs:
127136 tag_name : ${{ needs.build-test-promote.outputs.version }}
128137 body_path : ./changelog.md
129138 make_latest : true
139+ files : " ${{ steps.download-sbom.outputs.download-path }}/*.spdx.json"
Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ jobs:
110110 - ${{ inputs.variant == 'gnome' && 'GNOME: <version:gdm>' || 'KDE: <version:plasma-desktop>' }}:
111111 KMS_KEY_ALIAS : ${{ inputs.KMS_KEY_ALIAS }}
112112 AWS_REGION : ${{ inputs.AWS_REGION }}
113- generate-sbom : false
113+ generate-sbom : true
114114 secrets :
115115 REGISTRY_TOKEN : ${{ secrets.REGISTRY_TOKEN }}
116116 SIGNING_SECRET : ${{ secrets.SIGNING_SECRET }}
You can’t perform that action at this time.
0 commit comments