luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-09-07 19:36:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add SBOM license enrichment for AppImage variants

Browse Source 
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
This commit is contained in:
Darryl L. Miles
2026-07-23 16:09:35 -04:00
committed by R. Timothy Edwards
co-authored by copilot-swe-agent[bot] <198982749+[email protected]>
parent 298f19ce31
commit b0ba9db6a4
8 changed files with 200 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/appimage10.yml
+44 -3
View File
@@ -408,9 +408,50 @@ jobs:
with:
path: ${{ github.workspace }}/appimage/10/squashfs-root
format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }}
output-file: ${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false
upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/10
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload
.github/workflows/appimage7.yml
+44 -3
View File
@@ -408,9 +408,50 @@ jobs:
with:
path: ${{ github.workspace }}/appimage/7/squashfs-root
format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }}
output-file: ${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false
upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/7
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload
.github/workflows/appimage8.yml
+44 -3
View File
@@ -408,9 +408,50 @@ jobs:
with:
path: ${{ github.workspace }}/appimage/8/squashfs-root
format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }}
output-file: ${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false
upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/8
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload
.github/workflows/appimage9.yml
+44 -3
View File
@@ -408,9 +408,50 @@ jobs:
with:
path: ${{ github.workspace }}/appimage/9/squashfs-root
format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }}
output-file: ${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: false
upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/9
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload