Skip to content

Commit 0ea2cd3

Browse files
authored
Merge branch 'master' into dependabot/maven/com.puppycrawl.tools-checkstyle-13.9.0
2 parents 3e69b67 + e378378 commit 0ea2cd3

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Dependabot Auto-Merge
22

3-
on: pull_request
3+
on: pull_request_target
44

55
permissions:
66
contents: write
@@ -10,7 +10,7 @@ jobs:
1010
dependabot:
1111
name: Enable Auto-Merge
1212
runs-on: ubuntu-latest
13-
if: github.actor == 'dependabot[bot]'
13+
if: github.event.pull_request.user.login == 'dependabot[bot]'
1414
steps:
1515
- name: Dependabot metadata
1616
id: metadata
@@ -19,7 +19,9 @@ jobs:
1919
github-token: "${{ secrets.GITHUB_TOKEN }}"
2020

2121
- name: Enable auto-merge for Dependabot PRs
22-
run: gh pr merge --auto --merge "$PR_URL"
22+
run: |
23+
gh pr review --approve "$PR_URL" || true
24+
gh pr merge --auto --merge "$PR_URL"
2325
env:
2426
PR_URL: ${{github.event.pull_request.html_url}}
2527
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<vertx.version>4.5.27</vertx.version>
9292

9393
<!-- Test Dependencies -->
94-
<junit.version>5.11.4</junit.version>
94+
<junit.version>6.1.2</junit.version>
9595
<mockito.version>5.23.0</mockito.version>
9696
<assertj.version>3.27.7</assertj.version>
9797

0 commit comments

Comments
 (0)