Skip to content

Commit 23a06b5

Browse files
authored
Merge branch 'master' into dependabot/maven/org.junit-junit-bom-6.1.2
2 parents fbe08bf + 05687d4 commit 23a06b5

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎.github/workflows/benchmark.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
fi
5454
5555
- name: Upload Results
56-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v7
5757
with:
5858
name: benchmark-${{ matrix.name }}
5959
path: zthread-benchmark/target/benchmark-${{ matrix.name }}.json
@@ -100,7 +100,7 @@ jobs:
100100
file_pattern: "README.md assets/benchmark_graph.svg zthread-benchmark/charts/* zthread-benchmark/benchmark.md"
101101

102102
- name: Upload Final Report
103-
uses: actions/upload-artifact@v4
103+
uses: actions/upload-artifact@v7
104104
with:
105105
name: benchmark-report
106106
path: |

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Upload Coverage Report
3636
if: matrix.java == '25'
37-
uses: actions/upload-artifact@v4
37+
uses: actions/upload-artifact@v7
3838
with:
3939
name: coverage-report
4040
path: '**/target/site/jacoco/'
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}}

0 commit comments

Comments
 (0)