Merge branch 'main' into sec

Co-authored-by: jackton1 <jackton1@users.noreply.github.com>

.github/workflows/sync-release-version.yml

@@ -32,6 +32,7 @@ jobs:
 
   update-version:
     runs-on: ubuntu-latest
+    needs: create-sec-tag
     steps:
       - uses: actions/checkout@v3
         with:
@@ -46,10 +47,8 @@ jobs:
           only_major: true
           paths: |
             README.md
-      - name: Generate CHANGELOG
+      - name: Run git-cliff
-        uses: tj-actions/github-changelog-generator@v1.18
+        uses: tj-actions/git-cliff@v1
-        with:
-          output: 'HISTORY.md'
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4.2.4
         with:

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