Skip to content

Commit 3962878

Browse files
committed
Merge branch 'develop' into feat/help-thread-stats
2 parents 8e1ae7d + c03731a commit 3962878

File tree

114 files changed

+5088
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+5088
-587
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"features": {
1010
"ghcr.io/devcontainers/features/java:1": {
11-
"version": "18.0.2.1-tem",
11+
"version": "25-tem",
1212
"jdkDistro": "tem",
1313
"installGradle": true
1414
},
@@ -35,4 +35,4 @@
3535
"postCreateCommand": {
3636
"config": "cp application/config.json.template application/config.json"
3737
}
38-
}
38+
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Basic checks
33
on: [pull_request]
44

55
env:
6-
JAVA_VERSION: 21
6+
JAVA_VERSION: 25
77

88
jobs:
99
spotless:
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/setup-java@v1
1515
with:
1616
java-version: ${{ env.JAVA_VERSION }}
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1818
- name: Check
1919
run: ./gradlew spotlessCheck
2020

@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/setup-java@v1
2727
with:
2828
java-version: ${{ env.JAVA_VERSION }}
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030
- name: Check
3131
run: ./gradlew test
3232

@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/setup-java@v1
3939
with:
4040
java-version: ${{ env.JAVA_VERSION }}
41-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v4
4242
with:
4343
fetch-depth: 2
4444
- name: Check

.github/workflows/code-analysis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ on:
88
- cron: '0 20 * * 4'
99

1010
env:
11-
JAVA_VERSION: 21
11+
JAVA_VERSION: 25
1212

1313
jobs:
1414
sonar:
1515
name: SonarCloud
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919
with:
2020
# Shallow clones should be disabled for a better relevancy of analysis
2121
fetch-depth: 0
@@ -24,13 +24,13 @@ jobs:
2424
with:
2525
java-version: ${{ env.JAVA_VERSION }}
2626
- name: Cache SonarCloud packages
27-
uses: actions/cache@v1
27+
uses: actions/cache@v4
2828
with:
2929
path: ~/.sonar/cache
3030
key: ${{ runner.os }}-sonar
3131
restore-keys: ${{ runner.os }}-sonar
3232
- name: Cache Gradle packages
33-
uses: actions/cache@v1
33+
uses: actions/cache@v4
3434
with:
3535
path: ~/.gradle/caches
3636
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -64,15 +64,15 @@ jobs:
6464
with:
6565
java-version: ${{ env.JAVA_VERSION }}
6666
- name: Checkout repository
67-
uses: actions/checkout@v2
67+
uses: actions/checkout@v4
6868
with:
6969
# We must fetch at least the immediate parents so that if this is
7070
# a pull request then we can check out the head.
7171
fetch-depth: 2
7272

7373
# Initializes the CodeQL tools for scanning.
7474
- name: Initialize CodeQL
75-
uses: github/codeql-action/init@v2
75+
uses: github/codeql-action/init@v3
7676
with:
7777
languages: ${{ matrix.language }}
7878
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -95,4 +95,4 @@ jobs:
9595
./gradlew build
9696
9797
- name: Perform CodeQL Analysis
98-
uses: github/codeql-action/analyze@v2
98+
uses: github/codeql-action/analyze@v3
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Comment When PR Merged
2+
on:
3+
pull_request:
4+
types:
5+
- closed
6+
branches:
7+
- develop
8+
9+
10+
jobs:
11+
if_merged:
12+
if: github.event.pull_request.merged == true
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/github-script@v7
16+
with:
17+
github-token: ${{secrets.GITHUB_TOKEN}}
18+
script: |
19+
const creator = context.payload.sender.login
20+
const opts = github.rest.issues.listForRepo.endpoint.merge({
21+
...context.issue,
22+
creator,
23+
state: 'all'
24+
})
25+
const issues = await github.paginate(opts)
26+
27+
for (const issue of issues) {
28+
if (issue.number === context.issue.number) {
29+
continue
30+
}
31+
32+
if (issue.pull_request) {
33+
return
34+
}
35+
}
36+
await github.rest.issues.createComment({
37+
issue_number: context.issue.number,
38+
owner: context.repo.owner,
39+
repo: context.repo.repo,
40+
body: `Congratulations on your first contribution! We're excited to have you on board. Your work will be included in the next release, so stay tuned!
41+
Are you a Together-Java member on Discord? If so, please share your username here. If not, that’s perfectly fine! If you change your mind, here's the link: ${{vars.SERVER_INVITE}}.
42+
Why do we need your username? We’d like to give you a shoutout to show our gratitude!`
43+
})

.github/workflows/docker-publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- 'master'
88

99
env:
10-
JAVA_VERSION: 21
10+
JAVA_VERSION: 25
1111

1212
jobs:
1313
docker:
@@ -21,7 +21,7 @@ jobs:
2121
shell: bash
2222
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
2323
id: extract_branch
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727
- name: Build and Publish Docker Image

.github/workflows/docker-verify.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Docker Verify
33
on: [pull_request]
44

55
env:
6-
JAVA_VERSION: 21
6+
JAVA_VERSION: 25
77

88
jobs:
99
docker:
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/setup-java@v1
1515
with:
1616
java-version: ${{ env.JAVA_VERSION }}
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
- name: Docker Verify

.github/workflows/releases.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defaults:
1010
shell: bash
1111

1212
env:
13-
JAVA_VERSION: 21
13+
JAVA_VERSION: 25
1414

1515
jobs:
1616

@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
java-version: ${{ env.JAVA_VERSION }}
2525

26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
2727

2828
- name: Build shadow jar
2929
run: ./gradlew shadowJar

.github/workflows/wiki-sync.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Wiki Sync
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- wiki/**
9+
- .github/workflows/wiki-sync.yaml
10+
11+
concurrency:
12+
group: sync-wiki
13+
cancel-in-progress: true
14+
15+
permissions:
16+
contents: write
17+
18+
jobs:
19+
sync-wiki:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- uses: actions/checkout@v4
23+
- uses: Andrew-Chen-Wang/github-wiki-action@v5.0.1

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
//Configure the JDK to Java 18 in settings
2+
//Configure the JDK to Java 25 in settings
33
"java.compile.nullAnalysis.mode": "disabled",
44
"java.format.settings.url": "meta/formatting/google-style-eclipse.xml",
55
"editor.formatOnSave": true,
66
"editor.formatOnPaste": true,
77
"java.format.enabled": true,
8-
}
8+
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# TJ-Bot
22

33
[![codefactor](https://img.shields.io/codefactor/grade/github/together-java/tj-bot)](https://www.codefactor.io/repository/github/together-java/tj-bot)
4-
![Java](https://img.shields.io/badge/Java-21-ff696c)
4+
![Java](https://img.shields.io/badge/Java-25-ff696c)
55
[![license](https://img.shields.io/github/license/Together-Java/TJ-Bot)](https://github.com/Together-Java/TJ-Bot/blob/master/LICENSE)
66
![GitHub release (latest by date)](https://img.shields.io/github/v/release/Together-Java/TJ-Bot?label=release)
77

0 commit comments

Comments
 (0)