diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f7e497..c419201 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,12 +25,12 @@ jobs: then CREATE_RELEASE="true" BUILD_VERSION=${GITHUB_REF#refs/tags/} - RELEASE_BODY=$(./latest-changelog.sh $BUILD_VERSION) + RELEASE_BODY=$(./latest-changelog.sh $BUILD_VERSION |sed '1s/[,,]$//;1s/^\(.*\)$/### \1\n/') if [[ -z "$RELEASE_BODY" ]] then RELEASE_BODY='### ${{ github.event.head_commit.message }}' fi - TG_CHANGELOG="$RELEASE_BODY" + TG_CHANGELOG=$(./latest-changelog.sh $BUILD_VERSION |sed '/^$/,$d;1d' |sed -n '{;=;p}' | sed "N;s/\n/. /g") elif [[ ${GITHUB_REF} == refs/pull* ]] then CREATE_RELEASE="false" diff --git a/latest-changelog.sh b/latest-changelog.sh index 8cba221..85ea774 100755 --- a/latest-changelog.sh +++ b/latest-changelog.sh @@ -6,4 +6,4 @@ set -e cd $(dirname $0) versionName=$1 versionName=${versionName:=$(./latest-version.sh)} -cat ./ChangeLog.txt |sed -n "/$versionName:/,\$p" |sed '/^$/,$d;1d' |sed '1s/[,,]$//;1s/^\(.*\)$/### \1\n/' +cat ./ChangeLog.txt |sed -n "/$versionName:/,\$p" |sed '/^$/,$d;1d'