Fix computation of latest version from GH CLI.

This commit is contained in:
Patrick Lehmann
2025-09-30 09:02:50 +02:00
parent 438207a68d
commit b61f479180
2 changed files with 7 additions and 6 deletions

View File

@@ -260,7 +260,7 @@ jobs:
currentMSYS2Version = "3.12" currentMSYS2Version = "3.12"
currentAlphaVersion = "3.14" currentAlphaVersion = "3.14"
currentAlphaRelease = "3.14.0-rc.2" currentAlphaRelease = "3.14.0-rc.3"
if systems == "": if systems == "":
print("::error title=Parameter::system_list is empty.") print("::error title=Parameter::system_list is empty.")

View File

@@ -496,14 +496,14 @@ jobs:
# Create JSON inventory # Create JSON inventory
if [[ "${{ inputs.inventory-json }}" != "" ]]; then if [[ "${{ inputs.inventory-json }}" != "" ]]; then
VERSION="1.0" STRUCT_VERSION="1.1"
# Use GitHub API to ask for latest version # Use GitHub API to ask for latest version
printf "Get latest released version via GitHub API ...\n" printf "Get latest released version via GitHub API ...\n"
printf " gh release list --json tagName,isLatest --jq '.[] | select(.isLatest == true) | .tagName' " printf " gh release list --json tagName,isLatest --jq '.[] | select(.isLatest == true) | .tagName' "
latestVersion=$(gh release list --json tagName,isLatest --jq '.[] | select(.isLatest == true) | .tagName') latestVersion=$(gh release list --json tagName,isLatest --jq '.[] | select(.isLatest == true) | .tagName')
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
if [[ -n "${latestVersion}" ]]; then if [[ -z "${latestVersion}" ]]; then
printf "${ANSI_LIGHT_RED}[UNKNOWN]${ANSI_NOCOLOR}\n" printf "${ANSI_LIGHT_RED}[UNKNOWN]${ANSI_NOCOLOR}\n"
latestVersion="unknown" latestVersion="unknown"
else else
@@ -528,7 +528,7 @@ jobs:
fi fi
jsonInventory=$(jq -c -n \ jsonInventory=$(jq -c -n \
--arg version "${VERSION}" \ --arg structVersion "${STRUCT_VERSION}" \
--arg date "$(date +"%Y-%m-%dT%H-%M-%S%:z")" \ --arg date "$(date +"%Y-%m-%dT%H-%M-%S%:z")" \
--argjson jsonMeta "$(jq -c -n \ --argjson jsonMeta "$(jq -c -n \
--arg tag "${{ inputs.tag }}" \ --arg tag "${{ inputs.tag }}" \
@@ -538,7 +538,8 @@ jobs:
--arg release "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ inputs.tag }}" \ --arg release "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ inputs.tag }}" \
--argjson jsonLatest "$(jq -c -n \ --argjson jsonLatest "$(jq -c -n \
--arg version "${latestVersion}" \ --arg version "${latestVersion}" \
'{"version": $version}' \ --arg release "${{ github.server_url }}/${{ github.repository }}/releases/download/${latestVersion}" \
'{"version": $version, "release-url": $release}' \
)" \ )" \
--argjson categories "$(jq -c -n \ --argjson categories "$(jq -c -n \
'$ARGS.positional' \ '$ARGS.positional' \
@@ -546,7 +547,7 @@ jobs:
)" \ )" \
'{"tag": $tag, "version": $version, "git-hash": $hash, "repository-url": $repo, "release-url": $release, "categories": $categories, "latest": $jsonLatest}' \ '{"tag": $tag, "version": $version, "git-hash": $hash, "repository-url": $repo, "release-url": $release, "categories": $categories, "latest": $jsonLatest}' \
)" \ )" \
'{"version": 1.0, "timestamp": $date, "meta": $jsonMeta, "files": {}}' '{"version": $structVersion, "timestamp": $date, "meta": $jsonMeta, "files": {}}'
) )
fi fi