diff --git a/.github/workflows/sec-auto-merge.yml b/.github/workflows/sec-auto-merge.yml new file mode 100644 index 00000000..35eed442 --- /dev/null +++ b/.github/workflows/sec-auto-merge.yml @@ -0,0 +1,32 @@ +name: Auto merge and fix conflicts +on: + push: + branches: + - main + +jobs: + automerge-sec: + runs-on: ubuntu-latest + name: Auto merge and fix merge conflicts + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Fix merge conflicts + run: | + git config --local user.email "github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + + git checkout sec + + git merge --no-edit --no-ff --strategy-option=ours main + + - name: Push changes + uses: ad-m/github-push-action@master + continue-on-error: true + with: + github_token: ${{ secrets.PAT_TOKEN }} + branch: sec diff --git a/HISTORY.md b/HISTORY.md index 703968c6..6cc3ed42 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,16 +1,16 @@ # Changelog -## [v35.7.1](https://github.com/tj-actions/changed-files/tree/v35.7.1) (2023-03-14) +## [v35.7.2](https://github.com/tj-actions/changed-files/tree/v35.7.2) (2023-03-17) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35...v35.7.1) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35...v35.7.2) -## [v35](https://github.com/tj-actions/changed-files/tree/v35) (2023-03-14) +## [v35](https://github.com/tj-actions/changed-files/tree/v35) (2023-03-17) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35.7.0-sec...v35) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35.7.1-sec...v35) **Fixed bugs:** -- \[BUG\] Error in GitHub Action dependencies tj-actions/glob and tj-actions/json2file [\#1023](https://github.com/tj-actions/changed-files/issues/1023) +- \[BUG\] all\_old\_new\_renamed\_files Gets all files renamed files from history [\#1030](https://github.com/tj-actions/changed-files/issues/1030) **Closed issues:** @@ -18,17 +18,36 @@ **Merged pull requests:** +- Bump tj-actions/glob from 16.11 to 16.12 [\#1032](https://github.com/tj-actions/changed-files/pull/1032) ([dependabot[bot]](https://github.com/apps/dependabot)) +- chore: update README.md [\#1031](https://github.com/tj-actions/changed-files/pull/1031) ([jackton1](https://github.com/jackton1)) +- chore\(deps\): update peter-evans/create-pull-request action to v4.2.4 [\#1028](https://github.com/tj-actions/changed-files/pull/1028) ([renovate[bot]](https://github.com/apps/renovate)) +- Upgraded to v35.7.1 [\#1027](https://github.com/tj-actions/changed-files/pull/1027) ([jackton1](https://github.com/jackton1)) + +## [v35.7.1-sec](https://github.com/tj-actions/changed-files/tree/v35.7.1-sec) (2023-03-14) + +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35-sec...v35.7.1-sec) + +## [v35-sec](https://github.com/tj-actions/changed-files/tree/v35-sec) (2023-03-14) + +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35.7.1...v35-sec) + +## [v35.7.1](https://github.com/tj-actions/changed-files/tree/v35.7.1) (2023-03-14) + +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35.7.0-sec...v35.7.1) + +**Fixed bugs:** + +- \[BUG\] Error in GitHub Action dependencies tj-actions/glob and tj-actions/json2file [\#1023](https://github.com/tj-actions/changed-files/issues/1023) + +**Merged pull requests:** + - Updated README.md [\#1026](https://github.com/tj-actions/changed-files/pull/1026) ([jackton1](https://github.com/jackton1)) - Updated README.md [\#1025](https://github.com/tj-actions/changed-files/pull/1025) ([jackton1](https://github.com/jackton1)) - fix: switch to git tag as opposed to full sha [\#1024](https://github.com/tj-actions/changed-files/pull/1024) ([jackton1](https://github.com/jackton1)) ## [v35.7.0-sec](https://github.com/tj-actions/changed-files/tree/v35.7.0-sec) (2023-03-13) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35-sec...v35.7.0-sec) - -## [v35-sec](https://github.com/tj-actions/changed-files/tree/v35-sec) (2023-03-13) - -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35.7.0...v35-sec) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v35.7.0...v35.7.0-sec) **Implemented enhancements:** @@ -691,7 +710,7 @@ ## [v34.3.3](https://github.com/tj-actions/changed-files/tree/v34.3.3) (2022-11-08) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.1...v34.3.3) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.2...v34.3.3) **Fixed bugs:** @@ -706,13 +725,13 @@ - chore: update readme [\#784](https://github.com/tj-actions/changed-files/pull/784) ([jackton1](https://github.com/jackton1)) - Upgraded to v34.3.2 [\#781](https://github.com/tj-actions/changed-files/pull/781) ([jackton1](https://github.com/jackton1)) -## [v34.3.1](https://github.com/tj-actions/changed-files/tree/v34.3.1) (2022-11-07) - -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.2...v34.3.1) - ## [v34.3.2](https://github.com/tj-actions/changed-files/tree/v34.3.2) (2022-11-07) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.0...v34.3.2) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.1...v34.3.2) + +## [v34.3.1](https://github.com/tj-actions/changed-files/tree/v34.3.1) (2022-11-07) + +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.0...v34.3.1) **Fixed bugs:** @@ -1045,7 +1064,7 @@ ## [v31.0.0](https://github.com/tj-actions/changed-files/tree/v31.0.0) (2022-09-25) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v30.0.0...v31.0.0) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v30...v31.0.0) **Merged pull requests:** @@ -1058,13 +1077,13 @@ - chore: update broken link [\#642](https://github.com/tj-actions/changed-files/pull/642) ([jackton1](https://github.com/jackton1)) - Upgraded to v30.0.0 [\#641](https://github.com/tj-actions/changed-files/pull/641) ([jackton1](https://github.com/jackton1)) -## [v30.0.0](https://github.com/tj-actions/changed-files/tree/v30.0.0) (2022-09-24) - -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v30...v30.0.0) - ## [v30](https://github.com/tj-actions/changed-files/tree/v30) (2022-09-24) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v29.0.9...v30) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v30.0.0...v30) + +## [v30.0.0](https://github.com/tj-actions/changed-files/tree/v30.0.0) (2022-09-24) + +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v29.0.9...v30.0.0) **Fixed bugs:** @@ -2011,7 +2030,7 @@ ## [v12](https://github.com/tj-actions/changed-files/tree/v12) (2021-12-14) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.9...v12) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11...v12) **Implemented enhancements:** @@ -2029,13 +2048,13 @@ - \[PR 1\]: Renamed all\_modified\_files to all\_changed\_files [\#283](https://github.com/tj-actions/changed-files/pull/283) ([jackton1](https://github.com/jackton1)) - Upgraded to v11.9 [\#280](https://github.com/tj-actions/changed-files/pull/280) ([jackton1](https://github.com/jackton1)) -## [v11.9](https://github.com/tj-actions/changed-files/tree/v11.9) (2021-12-04) - -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11...v11.9) - ## [v11](https://github.com/tj-actions/changed-files/tree/v11) (2021-12-04) -[Full Changelog](https://github.com/tj-actions/changed-files/compare/v1.3.1...v11) +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.9...v11) + +## [v11.9](https://github.com/tj-actions/changed-files/tree/v11.9) (2021-12-04) + +[Full Changelog](https://github.com/tj-actions/changed-files/compare/v1.3.1...v11.9) **Implemented enhancements:** diff --git a/README.md b/README.md index e9f411d8..32afc638 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ## changed-files -Retrieve all changed files and directories relative to the target branch or the last remote commit returning a **relative path** from the project root. +Retrieve all changed files and directories relative to a target branch, preceeding commit or the last remote commit returning a **relative paths** from the project root. ## Table of contents @@ -63,7 +63,7 @@ Retrieve all changed files and directories relative to the target branch or the > > * **IMPORTANT:** For `push` events you need to include `fetch-depth: 0` **OR** `fetch-depth: 2` depending on your use case. > * For monorepos where pulling all the branch history might not be desired, you can omit `fetch-depth` for `pull_request` events. -> * For files located in a sub-directory ensure that the pattern specified contains `**/` (globstar) to match any preceding directories or explicitly pass the full path relative to the project root. See: [#314](https://github.com/tj-actions/changed-files/issues/314). +> * For files located in a sub-directory ensure that the pattern specified contains `**/` (globstar) to match any preceding directories or explicitly pass the full path relative to the project root. See: [Pattern Gotcha](https://github.com/tj-actions/glob#pattern-gotcha). > * All multiline inputs should not use double or single quotes since the value is already a string seperated by a newline character. See [Examples](#examples) for more information. > * Ensure that `persist-credentials` is set to `true` when configuring `actions/checkout` if `fetch-depth` isn't set to `0`. @@ -120,18 +120,19 @@ jobs: echo "List all the files that have changed: ${{ steps.changed-files-specific.outputs.all_changed_files }}" # Example 3 - - name: Get changed js files excluding the docs folder + - name: Get all changed *.js file(s) or any file in the static folder excluding the docs folder id: changed-files-excluded uses: tj-actions/changed-files@v35 with: files: | **/*.js - files_ignore: docs/** # Alternatively using: `docs` + static + files_ignore: docs - - name: Run step if any other js file(s) change + - name: Run step if any *.js file(s) or any file in the static folder change if: steps.changed-files-excluded.outputs.any_changed == 'true' run: | - echo "One or more js files not in the doc folder has changed." + echo "One or more *.js file(s) or any file in the static folder but not in the doc folder has changed." echo "List all the files that have changed: ${{ steps.changed-files-excluded.outputs.all_changed_files }}" ```