pyTooling/Actions
1
0
Fork 0
mirror of https://github.com/pyTooling/Actions.git synced 2026-02-12 02:56:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Take inventory categories from input parameter.

Browse Source
This commit is contained in:
Patrick Lehmann
2025-01-14 13:11:02 +01:00
parent f61b77ee72
commit c3b7b3ca64
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/NightlyRelease.yml vendored
View File

@@ -76,6 +76,10 @@ on:
type: string
required: false
default: ''
inventory-categories:
type: string
required: false
default: ''
tarball-name:
type: string
required: false
@@ -214,7 +218,16 @@ jobs:
# Create JSON inventory
if [[ "${{ inputs.inventory-json }}" != "" ]]; then
VERSION="1.0"
ORDER=("os-name" "os-version" "os-arch" "runtime" "ghdl-backend")
# Split categories by ',' into a Bash array.
# See https://stackoverflow.com/a/45201229/3719459
if [[ "${{ inputs.inventory-categories }}" != "" ]]; then
readarray -td, inventoryCategories <<<"${{ inputs.inventory-categories }},"
unset 'inventoryCategories[-1]'
declare -p inventoryCategories
else
inventoryCategories=""
fi
jsonInventory=$(jq -c -n \
--arg version "${VERSION}" \
@@ -224,14 +237,14 @@ jobs:
--arg version "${{ inputs.inventory-version }}" \
--arg hash "${{ github.sha }}" \
--arg repo "${{ github.server_url }}/${{ github.repository }}" \
'{"tag": $tag, "version": $version, "git-hash": $hash, "repository-url": $repo}' \
--arg release "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ inputs.nightly_name }}" \
--argjson categories "$(jq -c -n \
'$ARGS.positional' \
--args "${inventoryCategories[@]}" \
)" \
'{"tag": $tag, "version": $version, "git-hash": $hash, "repository-url": $repo, "release-url": $release, "categories": $categories}' \
)" \
--argjson jsonInfo "$(jq -c -n \
--arg url "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ inputs.nightly_name }}" \
--argjson order "$(jq -c -n '$ARGS.positional' --args "${ORDER[@]}")" \
'{"release-url": $url, "categories": $order}'
)" \
'{"version": 1.0, "timestamp": $date, "meta": $jsonMeta, "info": $jsonInfo, "files": {}}'
'{"version": 1.0, "timestamp": $date, "meta": $jsonMeta, "files": {}}'
)
fi

10
.github/workflows/_Checking_Nightly.yml vendored
View File

@@ -103,12 +103,12 @@ jobs:
* iventory.json
inventory-json: "inventory.json"
inventory-version: 4.2.5
# inventory-categories:
inventory-categories: "kind1,kind2"
assets: |
document: document1.txt: doc;html: Documentation
document: build.log: build;log: Logfile - %tool% - %tool%
other: document1.txt: build;SBOM:SBOM - %version%
other: %prog%.py: app;binary:Application - %tool% - %version%
document: document1.txt: doc,html: Documentation
document: build.log: build,log: Logfile - %tool% - %tool%
other: document1.txt: build,SBOM:SBOM - %version%
other: %prog%.py: app,binary:Application - %tool% - %version%
document:!archive1.zip: Archive 1 - zip
document:!archive2.tgz: Archive 2 - tgz
document:!archive3.tar.gz: Archive 3 - tar.gz