Skip to content

Commit 86a351b

Browse files
committed
ci: fix automerge dependabot PRs
1 parent 5dfac9f commit 86a351b

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

.github/workflows/dependabot_automerge.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,24 @@ permissions:
77

88
jobs:
99
dependabot:
10+
name: Auto-merge Dependabot PRs
1011
runs-on: ubuntu-latest
1112
if: github.actor == 'dependabot[bot]'
13+
1214
steps:
13-
- name: Dependabot metadata
15+
- name: Fetch Dependabot metadata
1416
id: metadata
15-
uses: dependabot/fetch-metadata@v1.6.0
17+
uses: dependabot/fetch-metadata@v2.5.0
1618
with:
17-
github-token: "${{ secrets.GITHUB_TOKEN }}"
18-
- name: Enable auto-merge for Dependabot PRs
19-
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' && steps.metadata.outputs.update-type == 'version-update:semver-minor'
20-
run: gh pr merge --auto --merge "$PR_URL"
19+
github-token: ${{ secrets.GITHUB_TOKEN }}
20+
21+
- name: Enable auto-merge for patch and minor updates
22+
if: |
23+
steps.metadata.outputs.update-type == 'version-update:semver-patch' ||
24+
steps.metadata.outputs.update-type == 'version-update:semver-minor'
25+
run: |
26+
gh pr merge ${{ github.event.pull_request.number }} \
27+
--auto \
28+
--squash
2129
env:
22-
PR_URL: ${{github.event.pull_request.html_url}}
23-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
30+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)