Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8dfe0ee3f4 | ||
|
|
467d26c8b7 | ||
|
|
bb40edd264 | ||
|
|
c6de787438 | ||
|
|
45f1e8fb92 | ||
|
|
ff85b03c27 | ||
|
|
bc42b5f993 |
5
.github/workflows/auto-merge.yml
vendored
5
.github/workflows/auto-merge.yml
vendored
@@ -2,7 +2,6 @@ name: automerge
|
||||
on:
|
||||
check_suite:
|
||||
types:
|
||||
- rerequested
|
||||
- completed
|
||||
|
||||
jobs:
|
||||
@@ -19,9 +18,9 @@ jobs:
|
||||
- name: automerge
|
||||
uses: pascalgn/automerge-action@v0.14.3
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN || github.token }}
|
||||
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
|
||||
MERGE_METHOD: "rebase"
|
||||
UPDATE_METHOD: "rebase"
|
||||
MERGE_RETRIES: "6"
|
||||
MERGE_RETRY_SLEEP: "100000"
|
||||
MERGE_LABELS: ""
|
||||
MERGE_LABELS: ""
|
||||
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
- name: Checkout to branch
|
||||
uses: actions/checkout@v2
|
||||
- name: shellcheck
|
||||
uses: reviewdog/action-shellcheck@v1.10
|
||||
uses: reviewdog/action-shellcheck@v1.12
|
||||
|
||||
test-multiple-repositories:
|
||||
name: Test with multiple repositories
|
||||
|
||||
31
HISTORY.md
31
HISTORY.md
@@ -1,5 +1,32 @@
|
||||
# Changelog
|
||||
|
||||
## [v1.2.2](https://github.com/tj-actions/changed-files/tree/v1.2.2) (2021-11-19)
|
||||
|
||||
[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.6...v1.2.2)
|
||||
|
||||
**Fixed bugs:**
|
||||
|
||||
- \[BUG\] pull request with `since_last_remote_commit = true` returns fatal: bad object [\#253](https://github.com/tj-actions/changed-files/issues/253)
|
||||
|
||||
**Closed issues:**
|
||||
|
||||
- Dependency Dashboard [\#27](https://github.com/tj-actions/changed-files/issues/27)
|
||||
|
||||
**Merged pull requests:**
|
||||
|
||||
- Updated git fetch to pull the last remote commit [\#254](https://github.com/tj-actions/changed-files/pull/254) ([jackton1](https://github.com/jackton1))
|
||||
- Update reviewdog/action-shellcheck action to v1.12 [\#252](https://github.com/tj-actions/changed-files/pull/252) ([renovate[bot]](https://github.com/apps/renovate))
|
||||
- Update reviewdog/action-shellcheck action to v1.11 [\#250](https://github.com/tj-actions/changed-files/pull/250) ([renovate[bot]](https://github.com/apps/renovate))
|
||||
- Upgraded to v11.6 [\#249](https://github.com/tj-actions/changed-files/pull/249) ([jackton1](https://github.com/jackton1))
|
||||
|
||||
## [v11.6](https://github.com/tj-actions/changed-files/tree/v11.6) (2021-11-08)
|
||||
|
||||
[Full Changelog](https://github.com/tj-actions/changed-files/compare/v1.2.1...v11.6)
|
||||
|
||||
**Merged pull requests:**
|
||||
|
||||
- Upgraded to v1.2.1 [\#248](https://github.com/tj-actions/changed-files/pull/248) ([jackton1](https://github.com/jackton1))
|
||||
|
||||
## [v1.2.1](https://github.com/tj-actions/changed-files/tree/v1.2.1) (2021-11-08)
|
||||
|
||||
[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.5...v1.2.1)
|
||||
@@ -8,10 +35,6 @@
|
||||
|
||||
- \[Feature\] Improve documentation [\#244](https://github.com/tj-actions/changed-files/issues/244)
|
||||
|
||||
**Closed issues:**
|
||||
|
||||
- Dependency Dashboard [\#27](https://github.com/tj-actions/changed-files/issues/27)
|
||||
|
||||
**Merged pull requests:**
|
||||
|
||||
- Updated formatting of all modified debug message [\#247](https://github.com/tj-actions/changed-files/pull/247) ([jackton1](https://github.com/jackton1))
|
||||
|
||||
@@ -112,7 +112,7 @@ jobs:
|
||||
| sha | `string` | `true` | `${{ github.sha }}` | Specify a different <br> commit SHA <br> used for <br> comparing changes |
|
||||
| files\_from\_source\_file | `string` | `false` | | Source file <br> used to populate <br> the files input |
|
||||
| path | `string` | `false` | | Relative path under <br> `GITHUB_WORKSPACE` <br> to the repository |
|
||||
| since\_last\_remote\_commit | `string` | `false` | `false` | Use the last commit on the remote <br> branch as the `base_sha`.<br> (Defaults to the previous commit). |
|
||||
| since\_last\_remote\_commit | `string` | `false` | `false` | Use the last commit on the remote <br> branch as the `base_sha`.<br> (Defaults to the previous commit). <br /> NOTE: This requires <br /> `fetch-depth: 0`|
|
||||
|
||||
## Example
|
||||
|
||||
|
||||
@@ -62,15 +62,18 @@ if [[ -z $GITHUB_BASE_REF ]]; then
|
||||
else
|
||||
TARGET_BRANCH=$GITHUB_BASE_REF
|
||||
CURRENT_BRANCH=$GITHUB_HEAD_REF
|
||||
git fetch temp_changed_files --no-tags -u "${TARGET_BRANCH}":"${TARGET_BRANCH}"
|
||||
|
||||
if [[ -z $INPUT_BASE_SHA ]]; then
|
||||
git fetch --no-tags -u --progress --depth=1 temp_changed_files "${TARGET_BRANCH}":"${TARGET_BRANCH}"
|
||||
PREVIOUS_SHA=$(git rev-parse "${TARGET_BRANCH}" 2>&1) && exit_status=$? || exit_status=$?
|
||||
else
|
||||
git fetch --no-tags -u --progress --depth=1 temp_changed_files "$INPUT_BASE_SHA"
|
||||
PREVIOUS_SHA=$INPUT_BASE_SHA
|
||||
fi
|
||||
|
||||
if [[ $exit_status -ne 0 ]]; then
|
||||
echo "::warning::Unable to determine the base ref sha for ${TARGET_BRANCH}"
|
||||
echo "::warning::You seem to be missing 'fetch-depth: 0' or 'fetch-depth: 2'. See https://github.com/tj-actions/changed-files#usage"
|
||||
git remote remove temp_changed_files
|
||||
exit 1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user