Compare commits

...

6 Commits

Author SHA1 Message Date
Tonye Jack
467d26c8b7 Updated git fetch to pull the last remote commit (#254)
* Update entrypoint.sh

* Update entrypoint.sh

* Update entrypoint.sh

* Update entrypoint.sh

* Update entrypoint.sh

* Update entrypoint.sh
2021-11-19 16:27:56 -05:00
Tonye Jack
bb40edd264 Update README.md 2021-11-18 19:09:51 -05:00
Tonye Jack
c6de787438 Updated .github/workflows/auto-merge.yml 2021-11-16 16:27:36 -05:00
Renovate Bot
45f1e8fb92 Update reviewdog/action-shellcheck action to v1.12 2021-11-16 11:01:29 -05:00
Renovate Bot
ff85b03c27 Update reviewdog/action-shellcheck action to v1.11 2021-11-13 05:10:59 -05:00
Tonye Jack
bc42b5f993 Upgraded from v1.2.1 -> v11.6 (#249)
Co-authored-by: jackton1 <jackton1@users.noreply.github.com>
2021-11-08 09:35:03 -05:00
5 changed files with 16 additions and 6 deletions

View File

@@ -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: ""

View File

@@ -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

View File

@@ -1,5 +1,13 @@
# Changelog
## [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)

View File

@@ -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

View File

@@ -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