Merge pull request #617 from tj-actions/fix/bug-with-similar-commits-when-github-event-before-is-empty
This commit is contained in:
commit
c41b715259
@ -161,13 +161,12 @@ runs:
|
|||||||
echo "::set-output name=base_sha::$BASE_SHA"
|
echo "::set-output name=base_sha::$BASE_SHA"
|
||||||
elif [[ -n "${{ inputs.base_sha }}" ]]; then
|
elif [[ -n "${{ inputs.base_sha }}" ]]; then
|
||||||
echo "::set-output name=base_sha::${{ inputs.base_sha }}"
|
echo "::set-output name=base_sha::${{ inputs.base_sha }}"
|
||||||
elif [[ "${{ inputs.since_last_remote_commit }}" == "true" && "${{ github.event.forced }}" == "true" && "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]]; then
|
elif [[ "${{ inputs.since_last_remote_commit }}" == "true" ]]; then
|
||||||
LAST_REMOTE_COMMIT=$(git rev-parse $(git branch -r --sort=-committerdate | head -1))
|
LAST_REMOTE_COMMIT=$(git rev-parse $(git branch -r --sort=-committerdate | head -1))
|
||||||
if [[ "${{ inputs.sha }}" != "$LAST_REMOTE_COMMIT" ]]; then
|
if [[ "${{ inputs.sha }}" == "$LAST_REMOTE_COMMIT" ]]; then
|
||||||
echo "::set-output name=base_sha::$LAST_REMOTE_COMMIT"
|
LAST_REMOTE_COMMIT=$(git rev-parse "${{ inputs.sha }}^1")
|
||||||
fi
|
fi
|
||||||
elif [[ "${{ inputs.since_last_remote_commit }}" == "true" && "${{ github.event.forced }}" != "true" && "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]]; then
|
echo "::set-output name=base_sha::$LAST_REMOTE_COMMIT"
|
||||||
echo "::set-output name=base_sha::${{ github.event.before }}"
|
|
||||||
fi
|
fi
|
||||||
id: base-sha
|
id: base-sha
|
||||||
shell: bash
|
shell: bash
|
||||||
|
Loading…
x
Reference in New Issue
Block a user