Merge branch 'main' into sec

Co-authored-by: jackton1 <jackton1@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

@@ -50,7 +50,7 @@ jobs:
       - 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/test.yml

@@ -7,9 +7,11 @@ on:
   pull_request:
     branches:
       - main
+      - sec
   pull_request_review:
     branches:
       - main
+      - sec
 
 jobs:
   shellcheck:

.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"

HISTORY.md

@@ -1,5 +1,38 @@
 # Changelog
 
+# [35.7.12](https://github.com/tj-actions/changed-files/compare/v35.7.11...v35.7.12) - (2023-04-07)
+
+## <!-- 1 -->🐛 Bug Fixes
+
+- Error finding merge base ([#1077](https://github.com/tj-actions/changed-files/issues/1077)) ([b109d83](https://github.com/tj-actions/changed-files/commit/b109d83a62e94cf7c522bf6c15cb25c175850b16))  - (Tonye Jack)
+
+## <!-- 26 -->🔄 Update
+
+- Update README.md ([b109d82](https://github.com/tj-actions/changed-files/commit/b109d82bbfde6cb823cdc004997909c7bea60617))  - (Tonye Jack)
+
+## <!-- 7 -->⚙️ Miscellaneous Tasks
+
+- **deps:** Update peter-evans/create-pull-request action to v5 (main) ([#1075](https://github.com/tj-actions/changed-files/issues/1075)) ([5c78c9f](https://github.com/tj-actions/changed-files/commit/5c78c9fe10b5544a89fd01d2bb4e87469c6170e7))  - (renovate[bot])
+- **deps:** Update tj-actions/json2file action to v1.4.1 (main) ([#1073](https://github.com/tj-actions/changed-files/issues/1073)) ([2f5a1b0](https://github.com/tj-actions/changed-files/commit/2f5a1b0ae264af377f8d0a68406b5ee26292fcc9))  - (renovate[bot])
+
+## <!-- 9 -->⬆️ Upgrades
+
+- Upgraded to v35.7.11 ([#1072](https://github.com/tj-actions/changed-files/issues/1072))
+
+Co-authored-by: jackton1 <jackton1@users.noreply.github.com> ([0302ff2](https://github.com/tj-actions/changed-files/commit/0302ff21cd4fb0ec0b9db26224ec891d438ecaf2))  - (Tonye Jack)
+
+# [35.7.11](https://github.com/tj-actions/changed-files/compare/v35.7.10...v35.7.11) - (2023-04-04)
+
+## <!-- 7 -->⚙️ Miscellaneous Tasks
+
+- Update sync-release-version.yml ([#1071](https://github.com/tj-actions/changed-files/issues/1071)) ([79adacd](https://github.com/tj-actions/changed-files/commit/79adacd43ea069e57037edc891ea8d33013bc3da))  - (Tonye Jack)
+
+## <!-- 9 -->⬆️ Upgrades
+
+- Upgraded to v35.7.10 ([#1070](https://github.com/tj-actions/changed-files/issues/1070))
+
+Co-authored-by: jackton1 <jackton1@users.noreply.github.com> ([b3ee2eb](https://github.com/tj-actions/changed-files/commit/b3ee2eb875e894b8589df93053c97b8cb36fbdfa))  - (Tonye Jack)
+
 # [35.7.10](https://github.com/tj-actions/changed-files/compare/v35.7.9...v35.7.10) - (2023-04-04)
 
 ## <!-- 7 -->⚙️ Miscellaneous Tasks

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: ./
@@ -757,36 +756,19 @@ And many more...
 
 With the switch from using grep's Extended regex to match files to the natively supported workflow glob pattern matching syntax introduced in [v13](https://github.com/tj-actions/changed-files/releases/tag/v13) you'll need to modify patterns used to match `files`.
 
-**BEFORE**
-
-```yml
+```diff
 ...
-
-      - name: Get specific changed files
-        id: changed-files-specific
-        uses: tj-actions/changed-files@v12.2
-        with:
-          files: |
-            \.sh$
-            .(sql|py)$
-            ^(mynewfile|custom)
-```
-
-**AFTER**
-
-```yml
-...
-
       - name: Get specific changed files
         id: changed-files-specific
         uses: tj-actions/changed-files@v24
         with:
           files: |
-            *.sh
-            *.sql
-            *.py
-            mynewfile
-            custom/**
+-            \.sh$
+-            .(sql|py)$
+-            ^(dir1|dir2)
++            *.{sh,sql,py}
++            dir1
++            dir2
 ```
 
 *   Free software: [MIT license](LICENSE)

action.yml

@@ -208,7 +208,7 @@ runs:
         INPUT_FETCH_DEPTH: ${{ inputs.fetch_depth }}
         INPUT_SINCE_LAST_REMOTE_COMMIT: ${{ inputs.since_last_remote_commit }}
     - name: Glob match
-      uses: tj-actions/glob@825a28bd3761909f83c56df3a13ccd5dbfa367b6 # v16.14
+      uses: tj-actions/glob@6056e69d50df3ce28e618aceb0a00203bb2d2de0 # v17.0.1
       id: glob
       with:
         files: ${{ inputs.files }}
@@ -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,13 +251,13 @@ 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..."

renovate.json

@@ -3,8 +3,8 @@
     "config:base"
   ],
   "enabled": true,
-  "prHourlyLimit": 10,
-  "prConcurrentLimit": 5,
+  "prHourlyLimit": 30,
+  "prConcurrentLimit": 10,
   "rebaseWhen": "behind-base-branch",
   "addLabels": [
     "dependencies",