Skip to content

Commit bf03a38

Browse files
committed
Support merge queues on dependabot PRs
From the `gh` cli docs: ``` gh pr merge --help Merge a pull request on GitHub. Without an argument, the pull request that belongs to the current branch is selected. When targeting a branch that requires a merge queue, no merge strategy is required. If required checks have not yet passed, auto-merge will be enabled. If required checks have passed, the pull request will be added to the merge queue. ```
1 parent 1ab5f82 commit bf03a38

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/dependabot-auto-merge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818

19-
- name: Enable auto-merge for minor and patch updates
19+
- name: Enable merge for minor and patch updates
2020
if: |
2121
steps.metadata.outputs.update-type == 'version-update:semver-minor' ||
2222
steps.metadata.outputs.update-type == 'version-update:semver-patch'
2323
run: |
24-
gh pr merge --auto --squash "$PR_URL"
25-
gh pr comment "$PR_URL" --body "✅ Auto-merge enabled. This PR will merge automatically once all checks pass."
24+
gh pr merge "$PR_URL"
25+
gh pr comment "$PR_URL" --body "✅ Auto-merge enabled. This PR will merge automatically / added to merge queue, once all checks pass."
2626
env:
2727
PR_URL: ${{ github.event.pull_request.html_url }}
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)