Merge branch 'main' into sec

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>

.github/workflows/submodule-sync.yml

@@ -19,7 +19,7 @@ jobs:
           git submodule update --remote --recursive
       
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.2.4
+        uses: peter-evans/create-pull-request@v5.0.0
         with:
           title: "Updated submodule"
           labels: "merge when passing"

.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,12 +47,10 @@ 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
+        uses: peter-evans/create-pull-request@v5.0.0
         with:
           base: "main"
           labels: "merge when passing"

.github/workflows/update-readme.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Create Pull Request
         if: failure()
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           base: "main"
           labels: "merge when passing"

README.md

@@ -350,7 +350,6 @@ See [action.yml](action.yml#L264) for a list of all available keys.
 
 ```yaml
 ...
-
    - name: Get changed files and write the outputs to a json file
      id: changed-files-write-output-files-json
      uses: ./

action.yml

@@ -255,7 +255,7 @@ runs:
         INPUT_HAS_CUSTOM_PATTERNS: ${{ steps.glob.outputs.has-custom-patterns }}
         INPUT_JSON_RAW_FORMAT: ${{ inputs.json_raw_format }}
     - name: Generate output files
-      uses: tj-actions/json2file@c56bc641b77b7b29451be35949e452fcadadf0d0 # v1.4.0
+      uses: tj-actions/json2file@e6872653b4c7168e64b05ee07f60c1cfce653560 # v1.4.1
       if: inputs.write_output_files == 'true'
       with:
         outputs: ${{ toJSON(steps.changed-files.outputs) }}

diff-sha.sh

@@ -251,23 +251,17 @@ else
 
       if [[ "$IS_SHALLOW" == "true" ]]; then
         # check if the merge base is in the local history
-        if ! git merge-base "$PREVIOUS_SHA" "$CURRENT_SHA" 1>/dev/null 2>&1; then
+        if ! git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA$DIFF$CURRENT_SHA" 1>/dev/null 2>&1; then
           echo "::debug::Merge base is not in the local history, fetching remote target branch..."
           # Fetch more of the target branch history until the merge base is found
           for i in {1..10}; do
             # shellcheck disable=SC2086
             git fetch $EXTRA_ARGS -u --progress --deepen="$INPUT_FETCH_DEPTH" origin +refs/heads/"$TARGET_BRANCH":refs/remotes/origin/"$TARGET_BRANCH" 1>/dev/null
-            if git merge-base "$PREVIOUS_SHA" "$CURRENT_SHA" 1>/dev/null 2>&1; then
+            if git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA$DIFF$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