Skip to content

Commit 3e69b67

Browse files
authored
Merge branch 'master' into dependabot/maven/com.puppycrawl.tools-checkstyle-13.9.0
2 parents 63da1af + 6ddf296 commit 3e69b67

7 files changed

Lines changed: 89 additions & 6 deletions

File tree

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/workflows/benchmark.yml‎

Lines changed: 3 additions & 3 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
@@ -76,7 +76,7 @@ jobs:
7676
run: pip install matplotlib pandas seaborn tabulate
7777

7878
- name: Download All Results
79-
uses: actions/download-artifact@v4
79+
uses: actions/download-artifact@v8
8080
with:
8181
path: benchmark-results
8282
pattern: benchmark-*
@@ -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: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Dependabot Auto-Merge
2+
3+
on: pull_request
4+
5+
permissions:
6+
contents: write
7+
pull-requests: write
8+
9+
jobs:
10+
dependabot:
11+
name: Enable Auto-Merge
12+
runs-on: ubuntu-latest
13+
if: github.actor == 'dependabot[bot]'
14+
steps:
15+
- name: Dependabot metadata
16+
id: metadata
17+
uses: dependabot/fetch-metadata@v2
18+
with:
19+
github-token: "${{ secrets.GITHUB_TOKEN }}"
20+
21+
- name: Enable auto-merge for Dependabot PRs
22+
run: gh pr merge --auto --merge "$PR_URL"
23+
env:
24+
PR_URL: ${{github.event.pull_request.html_url}}
25+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎zthread-benchmark/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<plugin>
6161
<groupId>org.apache.maven.plugins</groupId>
6262
<artifactId>maven-shade-plugin</artifactId>
63-
<version>3.6.0</version>
63+
<version>3.6.2</version>
6464
<executions>
6565
<execution>
6666
<phase>package</phase>

‎zthread-linux/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.awaitility</groupId>
3838
<artifactId>awaitility</artifactId>
39-
<version>4.2.2</version>
39+
<version>4.3.0</version>
4040
<scope>test</scope>
4141
</dependency>
4242
</dependencies>

0 commit comments

Comments
 (0)