Skip to content

Commit 333f5dd

Browse files
ForteScarletForteScarlet
committed
尝试更新发布和CI配置
1 parent cc0c93f commit 333f5dd

File tree

34 files changed

+424
-311
lines changed

34 files changed

+424
-311
lines changed

‎.github/workflows/publish-v4-kdoc.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44

55

66
env:
7+
JAVA_VERSION: 21
8+
JAVA_DISTRIBUTION: zulu
9+
GRADLE_VERSION: 8.5
710
IS_CI: true
811
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
912
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
@@ -18,25 +21,23 @@ jobs:
1821
runs-on: macos-latest
1922
steps:
2023
# 检出仓库代码
21-
- name: Check out repo
22-
uses: actions/checkout@v4
24+
- uses: actions/checkout@v4
2325
with:
2426
persist-credentials: false
2527
fetch-depth: 0
2628

2729
# setup Java
28-
- name: Setup java
29-
uses: actions/setup-java@v4
30+
- uses: actions/setup-java@v4
3031
with:
31-
distribution: 'zulu'
32-
java-version: 21
32+
distribution: ${{ env.JAVA_DISTRIBUTION }}
33+
java-version: ${{ env.JAVA_VERSION }}
3334
cache: 'gradle'
3435

3536
# setup Gradle
3637
- name: Gradle generate documentation
3738
uses: gradle/gradle-build-action@v3
3839
with:
39-
gradle-version: 8.5
40+
gradle-version: ${{ env.GRADLE_VERSION }}
4041
arguments: |
4142
dokkaHtmlMultiModule
4243
--info

‎.github/workflows/publish-v4-release.yml

Lines changed: 33 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- v4.**.**
66

77
env:
8+
JAVA_VERSION: 21
9+
JAVA_DISTRIBUTION: zulu
10+
GRADLE_VERSION: 8.5
811
IS_CI: true
912
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
1013
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
@@ -21,29 +24,22 @@ jobs:
2124
os: [ macos-latest, windows-latest, ubuntu-latest ]
2225
runs-on: ${{ matrix.os }}
2326
steps:
24-
# 检出仓库代码
25-
- name: Check Out Repo
26-
uses: actions/checkout@v4
27-
# setup Java
28-
- name: Setup Java 21
29-
uses: actions/setup-java@v4
27+
- uses: actions/checkout@v4
28+
- uses: actions/setup-java@v4
3029
with:
31-
distribution: 'zulu'
32-
java-version: 21
30+
distribution: ${{ env.JAVA_DISTRIBUTION }}
31+
java-version: ${{ env.JAVA_VERSION }}
3332
cache: 'gradle'
3433
- name: Run All Tests pre release
3534
uses: gradle/gradle-build-action@v3
3635
with:
37-
gradle-version: 8.5
38-
arguments: |
39-
assemble
40-
allTests
41-
--info
42-
--warning-mode all
36+
gradle-version: ${{ env.GRADLE_VERSION }}
37+
38+
- run: gradle assemble allTests -s
4339

4440
- name: Upload test reports
4541
uses: actions/upload-artifact@v4
46-
if: ${{ always() }}
42+
if: always()
4743
with:
4844
name: test-reports-${{ runner.os }}
4945
path: '**/build/reports/tests'
@@ -52,32 +48,24 @@ jobs:
5248
test-and-publish-v4-release:
5349
name: Publish v4 Release
5450
needs: test-pre-release
55-
strategy:
56-
matrix:
57-
os: [ macos-latest, windows-latest, ubuntu-latest ]
58-
runs-on: ${{ matrix.os }}
51+
runs-on: macos-latest
5952
steps:
60-
# 检出仓库代码
61-
- name: Check Out Repo
62-
uses: actions/checkout@v4
63-
64-
# setup Java
65-
- name: Setup Java 21
66-
uses: actions/setup-java@v4
53+
- uses: actions/checkout@v4
54+
- uses: actions/setup-java@v4
6755
with:
68-
distribution: 'zulu'
69-
java-version: 21
56+
distribution: ${{ env.JAVA_DISTRIBUTION }}
57+
java-version: ${{ env.JAVA_VERSION }}
7058
cache: 'gradle'
7159

7260
# setup Gradle
7361
- name: Gradle Publish Release
7462
uses: gradle/gradle-build-action@v3
7563
with:
76-
gradle-version: 8.5
64+
gradle-version: ${{ env.GRADLE_VERSION }}
7765
arguments: |
7866
publishToSonatype
7967
closeAndReleaseStagingRepositories
80-
--info
68+
-s
8169
--warning-mode all
8270
-x test
8371
--build-cache
@@ -89,38 +77,29 @@ jobs:
8977

9078
publish-v4-snapshot:
9179
name: Publish V4 snapshot
92-
strategy:
93-
matrix:
94-
os: [ macos-latest, windows-latest, ubuntu-latest ]
95-
runs-on: ${{ matrix.os }}
80+
runs-on: macos-latest
9681
needs: test-and-publish-v4-release
9782
steps:
98-
# 检出仓库代码
99-
- name: Check out repo
100-
uses: actions/checkout@v4
101-
102-
# setup Java
103-
- name: Setup java 21
104-
uses: actions/setup-java@v4
83+
- uses: actions/checkout@v4
84+
- uses: actions/setup-java@v4
10585
with:
106-
distribution: 'zulu'
107-
java-version: 21
86+
distribution: ${{ env.JAVA_DISTRIBUTION }}
87+
java-version: ${{ env.JAVA_VERSION }}
10888
cache: 'gradle'
10989

11090
# setup Gradle
11191
- name: Gradle publish snapshot
11292
uses: gradle/gradle-build-action@v3
11393
with:
114-
gradle-version: 8.5
94+
gradle-version: ${{ env.GRADLE_VERSION }}
11595
arguments: |
11696
publishToSonatype
11797
closeAndReleaseStagingRepositories
118-
--info
98+
-s
11999
--warning-mode all
120100
-x test
121101
--build-cache
122-
-Porg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
123-
102+
-Porg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
124103
env:
125104
SIMBOT_IS_SNAPSHOT: true
126105
SIMBOT_SNAPSHOT_ONLY: true
@@ -131,26 +110,21 @@ jobs:
131110
needs: test-and-publish-v4-release
132111
runs-on: ubuntu-latest
133112
steps:
134-
# 检出仓库代码
135-
- name: Check out repo
136-
uses: actions/checkout@v4
113+
- uses: actions/checkout@v4
137114
with:
138115
persist-credentials: false
139116
fetch-depth: 0
140-
141-
# setup Java
142-
- name: Setup java
143-
uses: actions/setup-java@v4
117+
- uses: actions/setup-java@v4
144118
with:
145-
distribution: 'zulu'
146-
java-version: 21
119+
distribution: ${{ env.JAVA_DISTRIBUTION }}
120+
java-version: ${{ env.JAVA_VERSION }}
147121
cache: 'gradle'
148122

149123
# setup Gradle
150124
- name: Gradle generate documentation
151125
uses: gradle/gradle-build-action@v3
152126
with:
153-
gradle-version: 8.5
127+
gradle-version: ${{ env.GRADLE_VERSION }}
154128
arguments: |
155129
dokkaHtmlMultiModule
156130
--info
@@ -179,14 +153,12 @@ jobs:
179153
permissions:
180154
contents: write
181155
steps:
182-
# 检出仓库代码
183-
- name: Check Out Repo
184-
uses: actions/checkout@v4
156+
- uses: actions/checkout@v4
185157

186158
# Create gitHub release
187159
# https://github.com/marketplace/actions/gh-release
188160
- name: Create Github Release
189-
uses: softprops/action-gh-release@v1
161+
uses: softprops/action-gh-release@v2
190162
with:
191163
token: ${{ secrets.PUSH_TOKEN }}
192164
body_path: .changelog/${{ github.ref_name }}.md

‎.github/workflows/publish-v4-snapshot.yml

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ on: # push
1818
- 'gradle.properties'
1919

2020
env:
21+
JAVA_VERSION: 21
22+
JAVA_DISTRIBUTION: zulu
23+
GRADLE_VERSION: 8.5
2124
IS_CI: true
2225
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
2326
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
@@ -29,62 +32,71 @@ env:
2932
GRADLE_OPTS: "-XX:MaxMetaspaceSize=2g -Dfile.encoding=UTF-8"
3033

3134
jobs:
32-
publish-v4-snapshot:
33-
name: Publish v4 snapshot
35+
run-tests:
36+
name: Run all tests
3437
strategy:
3538
matrix:
3639
os: [ macos-latest, windows-latest, ubuntu-latest ]
3740
runs-on: ${{ matrix.os }}
38-
steps:
39-
# 检出仓库代码
40-
- name: Check out repo
41-
uses: actions/checkout@v4
4241

43-
# setup Java
44-
- name: Setup Java
45-
uses: actions/setup-java@v4
42+
steps:
43+
- uses: actions/checkout@v4
44+
- uses: actions/setup-java@v4
4645
with:
47-
distribution: 'zulu'
48-
java-version: 21
46+
distribution: ${{ env.JAVA_DISTRIBUTION }}
47+
java-version: ${{ env.JAVA_VERSION }}
4948
cache: 'gradle'
5049

51-
# setup Node
52-
- name: Setup Node
53-
uses: actions/setup-node@v4
50+
- uses: actions/setup-node@v4
5451
with:
5552
node-version: 20
5653

57-
- name: Run All Tests
54+
- name: Setup Gradle
5855
uses: gradle/gradle-build-action@v3
5956
with:
60-
gradle-version: 8.5
61-
arguments: assemble allTests --info --warning-mode all --build-cache -Porg.gradle.daemon=false
57+
gradle-version: ${{ env.GRADLE_VERSION }}
58+
- run: gradle assemble allTests -s
6259

6360
- name: Upload test reports
6461
uses: actions/upload-artifact@v4
65-
if: ${{ always() }}
62+
if: always()
6663
with:
6764
name: test-reports-${{ matrix.os }}
6865
path: '**/build/reports/tests'
6966
retention-days: 7
7067

71-
- name: Gradle publish snapshot
68+
publish-v4-snapshot:
69+
name: Publish v4 snapshot
70+
needs: run-tests
71+
runs-on: macos-latest
72+
steps:
73+
# 检出仓库代码
74+
- uses: actions/checkout@v4
75+
# setup Java
76+
- uses: actions/setup-java@v4
77+
with:
78+
distribution: ${{ env.JAVA_DISTRIBUTION }}
79+
java-version: ${{ env.JAVA_VERSION }}
80+
cache: 'gradle'
81+
82+
# setup Node
83+
- uses: actions/setup-node@v4
84+
with:
85+
node-version: 20
86+
87+
- name: Publish snapshots
7288
uses: gradle/gradle-build-action@v3
7389
with:
74-
gradle-version: 8.5
90+
gradle-version: ${{ env.GRADLE_VERSION }}
7591
arguments: |
7692
publishToSonatype
7793
closeAndReleaseStagingRepositories
7894
--info
7995
--warning-mode all
8096
-x test
81-
--build-cache
8297
-Porg.gradle.jvmargs="-Xms4G -XX:MaxMetaspaceSize=1G -Dfile.encoding=UTF-8"
83-
-Porg.gradle.parallel=false
84-
85-
# parallel=true 容易出现 Metaspace 的异常
86-
# -Porg.gradle.daemon=false
8798
99+
# parallel=true 容易出现 Metaspace 的异常? 去了试试
88100

89101
deploy-doc:
90102
name: Deploy snapshots API doc
@@ -102,24 +114,23 @@ jobs:
102114
- name: Setup java
103115
uses: actions/setup-java@v4
104116
with:
105-
distribution: 'zulu'
106-
java-version: 21
117+
distribution: ${{ env.JAVA_DISTRIBUTION }}
118+
java-version: ${{ env.JAVA_VERSION }}
107119
cache: 'gradle'
108120

109121
# setup Gradle
110122
- name: Gradle generate documentation
111123
uses: gradle/gradle-build-action@v3
112124
with:
113-
gradle-version: 8.5
125+
gradle-version: ${{ env.GRADLE_VERSION }}
114126
arguments: |
115127
dokkaHtmlMultiModule
116-
--info
128+
-s
117129
--warning-mode all
118130
-x test
119-
--build-cache
120131
-Porg.gradle.jvmargs="-Xms4G -XX:MaxMetaspaceSize=1G -Dfile.encoding=UTF-8"
121-
-Porg.gradle.parallel=false
122132
133+
# -Porg.gradle.parallel=false
123134
# -Porg.gradle.daemon=false
124135
env:
125136
SIMBOT_IS_SNAPSHOT: true

‎.github/workflows/test-branch.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Run All Tests
2727
uses: gradle/gradle-build-action@v3
2828
with:
29-
gradle-version: 8.5
29+
gradle-version: ${{ env.GRADLE_VERSION }}
3030
arguments: |
3131
assemble
3232
build
@@ -49,13 +49,13 @@ jobs:
4949
- uses: actions/checkout@v4
5050
- uses: actions/setup-java@v4
5151
with:
52-
distribution: 'zulu'
53-
java-version: 21
52+
distribution: ${{ env.JAVA_DISTRIBUTION }}
53+
java-version: ${{ env.JAVA_VERSION }}
5454
cache: 'gradle'
5555
- name: Run Detekt
5656
uses: gradle/gradle-build-action@v3
5757
with:
58-
gradle-version: 8.5
58+
gradle-version: ${{ env.GRADLE_VERSION }}
5959
arguments: |
6060
assemble
6161
detekt
@@ -64,7 +64,7 @@ jobs:
6464
6565
- name: Upload detekt reports
6666
uses: actions/upload-artifact@v4
67-
if: ${{ always() }}
67+
if: always()
6868
with:
6969
name: detekt-reports-${{ runner.os }}
7070
path: 'build/reports/detekt'

0 commit comments

Comments
 (0)