ci: fix changelog generation

dekobon · Dec 27, 2022 · 405a6fa · 405a6fa
1 parent 28af38d
commit 405a6fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -78,6 +78,7 @@ jobs:
         run: |
              git fetch --tags
              git fetch --unshallow || true
+             git pull origin ${GITHUB_REF_NAME}
              make release-notes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/build/changelog.sh b/build/changelog.sh
@@ -29,7 +29,7 @@ else
   LAST_RELEASE="$(git tag -l | ${GREP} -E '^v[0-9]+\.[0-9]+\.[0-9]+$$' | sort --version-sort --field-separator=. --reverse | ${GREP} -v "${VERSION}" | head -n1)"
 fi
 
-LAST_RELEASE_HASH="$(git show --format=%H "${LAST_RELEASE}" | head -n1)"
+LAST_RELEASE_HASH="$(git show --format=%H "${LAST_RELEASE}" | head -n1 | ${SED} -e 's/^tag //')"
 
 echo "## Changes between ${LAST_RELEASE} [$LAST_RELEASE_HASH] and ${VERSION}:"
 git log --format="%s	(%h)" "${LAST_RELEASE_HASH}..HEAD" | \