From 6e426e6495fa7ea3451f37ce3f1dac2a3f16f62c Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Tue, 4 Apr 2023 13:07:27 -0600 Subject: [PATCH] chore: generate changelogs using tj-actions/git-cliff (#1069) --- .github/workflows/sync-release-version.yml | 6 ++---- diff-sha.sh | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sync-release-version.yml b/.github/workflows/sync-release-version.yml index 9e5693b2..39ac5c16 100644 --- a/.github/workflows/sync-release-version.yml +++ b/.github/workflows/sync-release-version.yml @@ -46,10 +46,8 @@ jobs: only_major: true paths: | README.md - - name: Generate CHANGELOG - uses: tj-actions/github-changelog-generator@v1.18 - with: - output: 'HISTORY.md' + - name: Run git-cliff + uses: tj-actions/git-cliff@v1 - name: Create Pull Request uses: peter-evans/create-pull-request@v4.2.4 with: diff --git a/diff-sha.sh b/diff-sha.sh index 934205a2..c3651fa1 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -260,14 +260,8 @@ else if git merge-base "$PREVIOUS_SHA" "$CURRENT_SHA" 1>/dev/null 2>&1; then break fi - echo "::debug::Merge base is not in the local history, fetching remote target branch again..." echo "::debug::Attempt $i/10" - - if [[ $i -eq 10 ]]; then - echo "::error::Unable to find the merge base between $PREVIOUS_SHA and $CURRENT_SHA" - exit 1 - fi done fi fi