diff --git a/.github/workflows/changelog-generation.yml b/.github/workflows/changelog-generation.yml index 082cdb9..b9a3ad6 100644 --- a/.github/workflows/changelog-generation.yml +++ b/.github/workflows/changelog-generation.yml @@ -31,11 +31,12 @@ jobs: id: tag_name run: | echo "tag_name=$(cat VERSION)" >> $GITHUB_ENV + echo "prev_tag_name=$(git show HEAD~1:VERSION)" >> $GITHUB_ENV - name: Get Base SHA from Tag id: base_sha run: | - echo "base_sha=$(git rev-list -n 1 "v${{ env.tag_name }}")" >> $GITHUB_ENV + echo "base_sha=$(git rev-list -n 1 "v${{ env.prev_tag_name }}")" >> $GITHUB_ENV continue-on-error: true - name: Create Pull Request diff --git a/generate-changelog.sh b/generate-changelog.sh index 7b22ea4..4b67a35 100644 --- a/generate-changelog.sh +++ b/generate-changelog.sh @@ -7,12 +7,14 @@ CURR_DIR=$(pwd) VERSION=$(cat VERSION) TAG_NAME="v${VERSION}" +PREVIOUS_VERSION=$(git show HEAD~1:VERSION) + MANUAL_START_SHA=$1 MANUAL_END_SHA=$2 # Get the start SHA based on the tag, if not manually provided if [ -z "$MANUAL_START_SHA" ]; then - START_SHA=$(git rev-list -n 1 "${TAG_NAME}") + START_SHA=$(git rev-list -n 1 "v${PREVIOUS_VERSION}") else START_SHA=$MANUAL_START_SHA fi