Skip to content

Commit d0ffd50

Browse files
committed
Make auto-merge more conservative
Only do auto-merges when the pull-request contains exactly one commit. This prevents pull-requests which are manually amended from being merged automatically.
1 parent 1662ec5 commit d0ffd50

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

.github/workflows/auto-merge.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ permissions:
88
jobs:
99
auto-merge:
1010
runs-on: ubuntu-latest
11-
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'lycheeverse/lychee'
11+
if: |
12+
github.event.pull_request.commits == 1 &&
13+
github.repository == 'lycheeverse/lychee' &&
14+
github.event.pull_request.user.login == 'dependabot[bot]'
15+
1216
steps:
1317
- name: Enable auto-merge for Dependabot PRs
1418
# Merge all updates as long as they pass CI

0 commit comments

Comments
 (0)