Skip to content

Commit

Permalink
Abort if resulting pull would end up with no changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinvanrijn committed Sep 29, 2023
1 parent 6dd0bf4 commit b298d1f
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,14 @@ jobs:
git add package.json
git -c user.name="GitHub" -c user.email="[email protected]" commit --author="github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>" -m"Fix package.json" | sed -n 1p || true
git push
if [[ $(git status --porcelain | tee /dev/stderr | head -c1 | wc -c) -ne 0 || $(git clean -dffx | tee /dev/stderr | head -c1 | wc -c) -ne 0 ]]; then
exit 1
if [[ $(git diff --stat "$(git log -1 --skip=2 --format=%H)" "$(git log -1 --format=%H)") -eq 0 ]]; then
echo "automerge_pull_action=close" >> "$GITHUB_ENV"
else
echo "automerge_pull_action=merge" >> "$GITHUB_ENV"
fi
fi
automerge:
runs-on: ubuntu-latest
needs: package_json
if: ${{ github.actor == 'dependabot[bot]' && needs.package_json.result == 'success' }}
steps:
- name: automerge
if: ${{ github.actor == 'dependabot[bot]' && env.automerge_pull_action == 'merge' }}
uses: actions/[email protected]
with:
script: |
Expand All @@ -45,13 +43,8 @@ jobs:
pull_number: context.payload.pull_request.number,
merge_method: 'merge'
})
close:
runs-on: ubuntu-latest
needs: package_json
if: ${{ github.actor == 'renovate[bot]' && needs.package_json.result == 'success' }}
steps:
- name: Close Pull
- name: close
if: ${{ github.actor == 'renovate[bot]' || (github.actor == 'dependabot[bot]' && env.automerge_pull_action == 'close') }}
uses: peter-evans/[email protected]
continue-on-error: true
with:
delete-branch: true

0 comments on commit b298d1f

Please sign in to comment.