Skip to content

Commit 4061f1a

Browse files
RakambdaRakambda
committed
Merge remote-tracking branch 'origin/develop' into feature/hermes
# Conflicts: # miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/hermes/data/message/subtype/PointReasonCode.java # miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/pubsub/TwitchPubSubWebSocketClientMessageTest.java # miner/src/test/java/fr/rakambda/channelpointsminer/miner/database/DatabaseEventHandlerTest.java # miner/src/test/java/fr/rakambda/channelpointsminer/miner/log/discord/DiscordMessageBuilderEmbedTest.java # miner/src/test/java/fr/rakambda/channelpointsminer/miner/log/discord/DiscordMessageBuilderMessageTest.java # miner/src/test/java/fr/rakambda/channelpointsminer/miner/log/telegram/TelegramMessageBuilderMessageTest.java
2 parents eee16f5 + 93a635c commit 4061f1a

31 files changed

Lines changed: 245 additions & 241 deletions

‎.github/ISSUE_TEMPLATE/0_bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Bug report
22
description: Create a report to help us improve
33
labels: ["type: 🐛 bug"]
4-
type: 'Bug'
4+
type: Bug
55
assignees:
66
- Rakambda
77
body:

‎.github/ISSUE_TEMPLATE/1_feature_request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: Feature request
22
description: Suggest an idea for this project
33
labels: ["type: 🧱 enhancement"]
4-
type: 'Enhancement'
4+
type: Enhancement
55
assignees:
66
- Rakambda
77
body:
88
- type: textarea
99
id: describing
1010
attributes:
1111
label: Description
12-
description: Describe the feature/enhacement you wish to have
12+
description: Describe the feature/enhancement you wish to have
1313
validations:
1414
required: true

‎.github/dependabot.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,37 @@ updates:
55
assignees:
66
- Rakambda
77
schedule:
8-
interval: daily
9-
time: '05:00'
8+
interval: cron
9+
cronjob: 0 6 * * *
1010
timezone: Europe/Paris
1111
pull-request-branch-name:
1212
separator: '-'
13+
groups:
14+
docker:
15+
patterns:
16+
- docker/*
1317
- package-ecosystem: gradle
1418
directory: /
1519
assignees:
1620
- Rakambda
1721
schedule:
18-
interval: daily
19-
time: '05:00'
22+
interval: cron
23+
cronjob: 0 6 * * *
2024
timezone: Europe/Paris
2125
pull-request-branch-name:
2226
separator: '-'
2327
groups:
2428
log4j:
2529
patterns:
26-
- org.apache.logging.log4j:log4j-core
27-
- org.apache.logging.log4j:log4j-slf4j2-impl
30+
- org.apache.logging.log4j:*
2831
google-apis:
2932
patterns:
3033
- com.google.api-client:google-api-client
34+
- com.google.apis:*
3135
- com.google.oauth-client:google-oauth-client-jetty
32-
- com.google.apis:google-api-services-gmail
33-
- com.google.apis:google-api-services-calendar
36+
exposed:
37+
patterns:
38+
- org.jetbrains.exposed:*
39+
lets-plot:
40+
patterns:
41+
- org.jetbrains.lets-plot:*

‎.github/workflows/build-test-deploy.yml‎

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,22 @@ on:
1313
workflow_dispatch:
1414

1515
jobs:
16-
dependency-submission:
17-
name: Dependencies submission
18-
runs-on: ubuntu-latest
19-
permissions:
20-
contents: write
21-
steps:
22-
- name: Checkout source
23-
uses: actions/checkout@v4
24-
- name: Set up JDK
25-
uses: actions/setup-java@v4
26-
with:
27-
distribution: 'temurin'
28-
java-version: ${{ vars.JAVA_VERSION }}
29-
- name: Generate and submit dependency graph
30-
uses: gradle/actions/dependency-submission@v4.3.0
31-
continue-on-error: true
32-
3316
build:
3417
name: Build project
3518
runs-on: ubuntu-latest
3619
steps:
3720
- name: Checkout source
38-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
3922
with:
4023
fetch-depth: 1
4124
- name: Set up JDK
42-
uses: actions/setup-java@v4
25+
uses: actions/setup-java@v5
4326
with:
4427
distribution: 'temurin'
4528
java-version: ${{ vars.JAVA_VERSION }}
4629

4730
- name: Setup Gradle
48-
uses: gradle/actions/setup-gradle@v4.3.0
31+
uses: gradle/actions/setup-gradle@v4.4.2
4932
- name: Build project
5033
run: |
5134
./gradlew \
@@ -77,16 +60,16 @@ jobs:
7760
checks: write
7861
steps:
7962
- name: Checkout source
80-
uses: actions/checkout@v4
63+
uses: actions/checkout@v5
8164
with:
8265
fetch-depth: 1
8366
- name: Set up JDK
84-
uses: actions/setup-java@v4
67+
uses: actions/setup-java@v5
8568
with:
8669
distribution: 'temurin'
8770
java-version: ${{ vars.JAVA_VERSION }}
8871
- name: Setup Gradle
89-
uses: gradle/actions/setup-gradle@v4.3.0
72+
uses: gradle/actions/setup-gradle@v4.4.2
9073

9174
- name: Run tests
9275
run: |
@@ -100,12 +83,12 @@ jobs:
10083
./gradlew \
10184
:miner:jacocoTestReport
10285
- name: Publish Test Report
103-
uses: mikepenz/action-junit-report@v5.3.0
86+
uses: mikepenz/action-junit-report@v5.6.2
10487
if: always()
10588
with:
10689
report_paths: 'miner/build/test-results/test/*.xml'
10790
- name: Publish coverage on CodeCov
108-
uses: codecov/codecov-action@v5.3.1
91+
uses: codecov/codecov-action@v5.5.0
10992
if: always()
11093
with:
11194
token: ${{ secrets.CODECOV_TOKEN }}
@@ -141,16 +124,16 @@ jobs:
141124
checks: write
142125
steps:
143126
- name: Checkout source
144-
uses: actions/checkout@v4
127+
uses: actions/checkout@v5
145128
with:
146129
fetch-depth: 1
147130
- name: Set up JDK
148-
uses: actions/setup-java@v4
131+
uses: actions/setup-java@v5
149132
with:
150133
distribution: 'temurin'
151134
java-version: ${{ vars.JAVA_VERSION }}
152135
- name: Setup Gradle
153-
uses: gradle/actions/setup-gradle@v4.3.0
136+
uses: gradle/actions/setup-gradle@v4.4.2
154137

155138
- name: Run tests
156139
run: |
@@ -164,12 +147,12 @@ jobs:
164147
./gradlew \
165148
:viewer:jacocoTestReport
166149
- name: Publish Test Report
167-
uses: mikepenz/action-junit-report@v5.3.0
150+
uses: mikepenz/action-junit-report@v5.6.2
168151
if: always()
169152
with:
170153
report_paths: 'viewer/build/test-results/test/*.xml'
171154
- name: Publish coverage on CodeCov
172-
uses: codecov/codecov-action@v5.3.1
155+
uses: codecov/codecov-action@v5.5.0
173156
if: always()
174157
with:
175158
token: ${{ secrets.CODECOV_TOKEN }}
@@ -205,16 +188,17 @@ jobs:
205188
- test-viewer
206189
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
207190
concurrency: miner_docker
191+
environment: DockerHub
208192
steps:
209193
- name: Checkout source
210-
uses: actions/checkout@v4
194+
uses: actions/checkout@v5
211195
- name: Set up JDK
212-
uses: actions/setup-java@v4
196+
uses: actions/setup-java@v5
213197
with:
214198
distribution: 'temurin'
215199
java-version: ${{ vars.JAVA_VERSION }}
216200
- name: Setup Gradle
217-
uses: gradle/actions/setup-gradle@v4.3.0
201+
uses: gradle/actions/setup-gradle@v4.4.2
218202

219203
- name: Calculate miner image name
220204
id: miner-image-name
@@ -235,16 +219,17 @@ jobs:
235219
- test-viewer
236220
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
237221
concurrency: viewer_docker
222+
environment: DockerHub
238223
steps:
239224
- name: Checkout source
240-
uses: actions/checkout@v4
225+
uses: actions/checkout@v5
241226
- name: Set up JDK
242-
uses: actions/setup-java@v4
227+
uses: actions/setup-java@v5
243228
with:
244229
distribution: 'temurin'
245230
java-version: ${{ vars.JAVA_VERSION }}
246231
- name: Setup Gradle
247-
uses: gradle/actions/setup-gradle@v4.3.0
232+
uses: gradle/actions/setup-gradle@v4.4.2
248233

249234
- name: Calculate viewer image name
250235
id: viewer-image-name

‎.github/workflows/gradle-wrapper-update.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Update Gradle Wrapper
2+
'on':
3+
workflow_dispatch: null
4+
schedule:
5+
- cron: 0 6 * * 0
6+
permissions:
7+
contents: write
8+
pull-requests: write
9+
jobs:
10+
update:
11+
uses: RakambdaOrg/rakambda-github-workflows/.github/workflows/gradle-update-wrapper.yml@main
12+
with:
13+
reviewers: Rakambda
14+
labels: dependencies,gradle-wrapper
15+
secrets:
16+
github-token: ${{ secrets.SYNC_TOKEN }}

‎.github/workflows/manual-docker.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ jobs:
88
name: Publish Miner on DockerHub
99
runs-on: ubuntu-latest
1010
concurrency: miner_docker
11+
environment: DockerHub
1112
steps:
1213
- name: Checkout source
13-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1415
- name: Set up JDK
15-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1617
with:
1718
distribution: 'temurin'
1819
java-version: ${{ vars.JAVA_VERSION }}
1920
- name: Setup Gradle
20-
uses: gradle/actions/setup-gradle@v4.3.0
21+
uses: gradle/actions/setup-gradle@v4.4.2
2122

2223
- name: Calculate miner image name
2324
id: miner-image-name
@@ -44,16 +45,17 @@ jobs:
4445
name: Publish Viewer on DockerHub
4546
runs-on: ubuntu-latest
4647
concurrency: viewer_docker
48+
environment: DockerHub
4749
steps:
4850
- name: Checkout source
49-
uses: actions/checkout@v4
51+
uses: actions/checkout@v5
5052
- name: Set up JDK
51-
uses: actions/setup-java@v4
53+
uses: actions/setup-java@v5
5254
with:
5355
distribution: 'temurin'
5456
java-version: ${{ vars.JAVA_VERSION }}
5557
- name: Setup Gradle
56-
uses: gradle/actions/setup-gradle@v4.3.0
58+
uses: gradle/actions/setup-gradle@v4.4.2
5759

5860
- name: Calculate viewer image name
5961
id: viewer-image-name

‎.github/workflows/pages.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
- name: Setup Pages
1818
uses: actions/configure-pages@v5
1919
- name: Install Node.js
@@ -30,7 +30,7 @@ jobs:
3030
mkdir pages
3131
cp -R .github/antora-docs/. pages
3232
- name: Upload artifact
33-
uses: actions/upload-pages-artifact@v3
33+
uses: actions/upload-pages-artifact@v4
3434
with:
3535
path: pages
3636

@@ -42,6 +42,7 @@ jobs:
4242
pages: write
4343
id-token: write
4444
runs-on: ubuntu-latest
45+
concurrency: pages
4546
needs: build
4647
name: Deploy pages
4748
steps:

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ jobs:
1010
name: Publish Miner on DockerHub
1111
runs-on: ubuntu-latest
1212
concurrency: miner_docker
13+
environment: DockerHub
1314
steps:
1415
- name: Checkout source
15-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1617
- name: Set up JDK
17-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1819
with:
1920
distribution: 'temurin'
2021
java-version: ${{ vars.JAVA_VERSION }}
2122
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v4.3.0
23+
uses: gradle/actions/setup-gradle@v4.4.2
2324

2425
- name: Push latest on Docker Hub
2526
run: |
@@ -33,16 +34,17 @@ jobs:
3334
name: Publish Viewer on DockerHub
3435
runs-on: ubuntu-latest
3536
concurrency: viewer_docker
37+
environment: DockerHub
3638
steps:
3739
- name: Checkout source
38-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
3941
- name: Set up JDK
40-
uses: actions/setup-java@v4
42+
uses: actions/setup-java@v5
4143
with:
4244
distribution: 'temurin'
4345
java-version: ${{ vars.JAVA_VERSION }}
4446
- name: Setup Gradle
45-
uses: gradle/actions/setup-gradle@v4.3.0
47+
uses: gradle/actions/setup-gradle@v4.4.2
4648

4749
- name: Push latest on Docker Hub
4850
run: |
@@ -59,21 +61,21 @@ jobs:
5961
contents: write
6062
steps:
6163
- name: Checkout source
62-
uses: actions/checkout@v4
64+
uses: actions/checkout@v5
6365
- name: Set up JDK
64-
uses: actions/setup-java@v4
66+
uses: actions/setup-java@v5
6567
with:
6668
distribution: 'temurin'
6769
java-version: ${{ vars.JAVA_VERSION }}
6870
- name: Setup Gradle
69-
uses: gradle/actions/setup-gradle@v4.3.0
71+
uses: gradle/actions/setup-gradle@v4.4.2
7072

7173
- name: Build project
7274
run: |
7375
./gradlew \
7476
assemble
7577
- name: Release
76-
uses: softprops/action-gh-release@v2.2.1
78+
uses: softprops/action-gh-release@v2.3.2
7779
with:
7880
fail_on_unmatched_files: false
7981
generate_release_notes: true

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
idea
3-
alias(libs.plugins.names)
43
}
54

65
group = "fr.rakambda"

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2.3.5
1+
version=2.3.7

0 commit comments

Comments
 (0)