diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 98a0b51..6c4dc19 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -13,9 +13,15 @@ jobs: - name: Get variables run: | - echo "CRATE=$(echo '${{ github.ref_name }}' | awk 'BEGIN{RS="/"} NR==1{print}')" >> $GITHUB_ENV - echo "CRATE_VERSION=$(echo '${{ github.ref_name }}' | awk 'BEGIN{RS="/"} NR==2{print}')" >> $GITHUB_ENV - echo "CHANGELOG=$(git show -s --format=%N "${{ github.ref_name }}" | tail -n +4)" >> $GITHUB_ENV + git fetch --tags --force #the checkout action does not load the tag message + + echo "CRATE=$(echo '${{ github.ref_name }}' | awk 'BEGIN{RS="/"} NR==1{print}')" >> "$GITHUB_ENV" + echo "CRATE_VERSION=$(echo '${{ github.ref_name }}' | awk 'BEGIN{RS="/"} NR==2{print}')" >> "$GITHUB_ENV" + { + echo 'CHANGELOG<> "$GITHUB_ENV" - name: 📤 Publish crate run: | diff --git a/Justfile b/Justfile index c320b58..c8d2dd1 100644 --- a/Justfile +++ b/Justfile @@ -86,4 +86,4 @@ release crate="rustypipe": git add "$CHANGELOG" "$CARGO_TOML" git commit -m "chore(release): release $CRATE v$VERSION" - awk 'BEGIN{RS="(^|\n)## "} NR==2 { print "##",$0 }' "$CHANGELOG" | git tag -a -F - --cleanup whitespace "${CRATE}/v${VERSION}" + awk 'BEGIN{RS="(^|\n)## [^\n]+\n*"} NR==2 { print }' "$CHANGELOG" | git tag -as -F - --cleanup whitespace "${CRATE}/v${VERSION}"