From 2e4a9fd2d2374c358f85851c4777950a0435dad1 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Tue, 5 Aug 2025 18:54:53 +0100 Subject: [PATCH] GHA: appimage: bring back tag --list -n message in release info For example the message string here. $ git tag --list -n 8.3.536 8.3.536 "Tagging version 8.3.536" This could contain additional information relating to the authenticity and signing info should that feature be used. Which is useful to see with the release info. Also git_previous_tag resolution is allowed to fail to an empty string. --- .github/workflows/appimage10.yml | 7 +++++++ .github/workflows/appimage7.yml | 7 +++++++ .github/workflows/appimage8.yml | 7 +++++++ .github/workflows/appimage9.yml | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/.github/workflows/appimage10.yml b/.github/workflows/appimage10.yml index 03f2dfe1..d204e173 100644 --- a/.github/workflows/appimage10.yml +++ b/.github/workflows/appimage10.yml @@ -105,8 +105,10 @@ jobs: echo "" >> RELEASE-NOTES-EL10.txt # RELEASE-NOTES-CL.txt + set +e # allow this to fail to empty string git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1)) echo git_previous_tag=$git_previous_tag + set -e if [ -n "${git_previous_tag}" ] then echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt @@ -136,6 +138,11 @@ jobs: # RELEASE-NOTES-GH.txt (this is shared for all AppImage for one tag) echo "### commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-GH.txt + if [[ "$GITHUB_REF" =~ ^refs/tags/ ]] + then + # show tag annotation with tags like before + git tag --cleanup=strip "--format=%(contents)" -n "${GITHUB_REF:10}" | sed -e 's#\([~|]\)#\\\1#g' >> RELEASE-NOTES-GH.txt + fi echo "" >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-DOCS.txt >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-CL.txt >> RELEASE-NOTES-GH.txt diff --git a/.github/workflows/appimage7.yml b/.github/workflows/appimage7.yml index ad78d40b..568f6716 100644 --- a/.github/workflows/appimage7.yml +++ b/.github/workflows/appimage7.yml @@ -105,8 +105,10 @@ jobs: echo "" >> RELEASE-NOTES-EL7.txt # RELEASE-NOTES-CL.txt + set +e # allow this to fail to empty string git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1)) echo git_previous_tag=$git_previous_tag + set -e if [ -n "${git_previous_tag}" ] then echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt @@ -136,6 +138,11 @@ jobs: # RELEASE-NOTES-GH.txt (this is shared for all AppImage for one tag) echo "### commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-GH.txt + if [[ "$GITHUB_REF" =~ ^refs/tags/ ]] + then + # show tag annotation with tags like before + git tag --cleanup=strip "--format=%(contents)" -n "${GITHUB_REF:10}" | sed -e 's#\([~|]\)#\\\1#g' >> RELEASE-NOTES-GH.txt + fi echo "" >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-DOCS.txt >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-CL.txt >> RELEASE-NOTES-GH.txt diff --git a/.github/workflows/appimage8.yml b/.github/workflows/appimage8.yml index 0f6cc3fe..53251aef 100644 --- a/.github/workflows/appimage8.yml +++ b/.github/workflows/appimage8.yml @@ -105,8 +105,10 @@ jobs: echo "" >> RELEASE-NOTES-EL8.txt # RELEASE-NOTES-CL.txt + set +e # allow this to fail to empty string git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1)) echo git_previous_tag=$git_previous_tag + set -e if [ -n "${git_previous_tag}" ] then echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt @@ -136,6 +138,11 @@ jobs: # RELEASE-NOTES-GH.txt (this is shared for all AppImage for one tag) echo "### commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-GH.txt + if [[ "$GITHUB_REF" =~ ^refs/tags/ ]] + then + # show tag annotation with tags like before + git tag --cleanup=strip "--format=%(contents)" -n "${GITHUB_REF:10}" | sed -e 's#\([~|]\)#\\\1#g' >> RELEASE-NOTES-GH.txt + fi echo "" >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-DOCS.txt >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-CL.txt >> RELEASE-NOTES-GH.txt diff --git a/.github/workflows/appimage9.yml b/.github/workflows/appimage9.yml index 23e1b1f4..88f9be15 100644 --- a/.github/workflows/appimage9.yml +++ b/.github/workflows/appimage9.yml @@ -105,8 +105,10 @@ jobs: echo "" >> RELEASE-NOTES-EL9.txt # RELEASE-NOTES-CL.txt + set +e # allow this to fail to empty string git_previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1)) echo git_previous_tag=$git_previous_tag + set -e if [ -n "${git_previous_tag}" ] then echo "### Change Log (since previous tag):" > RELEASE-NOTES-CL.txt @@ -136,6 +138,11 @@ jobs: # RELEASE-NOTES-GH.txt (this is shared for all AppImage for one tag) echo "### commit ${git_describe}" | sed -e 's#~#\\~#g' > RELEASE-NOTES-GH.txt + if [[ "$GITHUB_REF" =~ ^refs/tags/ ]] + then + # show tag annotation with tags like before + git tag --cleanup=strip "--format=%(contents)" -n "${GITHUB_REF:10}" | sed -e 's#\([~|]\)#\\\1#g' >> RELEASE-NOTES-GH.txt + fi echo "" >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-DOCS.txt >> RELEASE-NOTES-GH.txt cat RELEASE-NOTES-CL.txt >> RELEASE-NOTES-GH.txt