Skip to content

Commit 890b718

Browse files
AlbumenJAlbumenJ
committed
Merge branch '3.2.17-release' into apache-3.2
2 parents 8e4d116 + 6ccb3f2 commit 890b718

File tree

5 files changed

+29
-30
lines changed

5 files changed

+29
-30
lines changed

‎.github/workflows/release-test.yml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
license:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
- name: Check License
3030
uses: apache/skywalking-eyes@main
3131
env:
@@ -35,13 +35,13 @@ jobs:
3535
outputs:
3636
version: ${{ steps.dubbo-version.outputs.version }}
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939
with:
4040
path: dubbo
41-
- uses: actions/setup-java@v3
41+
- uses: actions/setup-java@v4
4242
with:
4343
distribution: 'zulu'
44-
java-version: 8
44+
java-version: 21
4545
- uses: actions/cache@v3
4646
name: "Cache local Maven repository"
4747
with:
@@ -74,7 +74,6 @@ jobs:
7474
REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' ./dubbo/pom.xml`
7575
echo "version=$REVISION" >> $GITHUB_OUTPUT
7676
echo "dubbo version: $REVISION"
77-
7877
unit-test-prepare:
7978
name: " Preparation for Unit Test On ${{ matrix.os }}"
8079
runs-on: ${{ matrix.os }}
@@ -83,7 +82,7 @@ jobs:
8382
matrix:
8483
os: [ ubuntu-latest, windows-latest ]
8584
env:
86-
ZOOKEEPER_VERSION: 3.6.3
85+
ZOOKEEPER_VERSION: 3.7.2
8786
steps:
8887
- uses: actions/cache@v3
8988
name: "Cache zookeeper binary archive"
@@ -123,7 +122,6 @@ jobs:
123122
wget -c http://mirror.apache-kr.org/apache/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz
124123
echo "list the downloaded zookeeper binary archive"
125124
ls -al ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz
126-
127125
unit-test:
128126
needs: [build-source, unit-test-prepare]
129127
name: "Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk }})"
@@ -136,9 +134,9 @@ jobs:
136134
env:
137135
DISABLE_FILE_SYSTEM_TEST: true
138136
steps:
139-
- uses: actions/checkout@v3
137+
- uses: actions/checkout@v4
140138
- name: "Set up JDK ${{ matrix.jdk }}"
141-
uses: actions/setup-java@v3
139+
uses: actions/setup-java@v4
142140
with:
143141
java-version: ${{ matrix.jdk }}
144142
distribution: 'zulu'
@@ -181,9 +179,9 @@ jobs:
181179
DUBBO_DEFAULT_SERIALIZATION: fastjson2
182180
MAVEN_SUREFIRE_ADD_OPENS: true
183181
steps:
184-
- uses: actions/checkout@v3
182+
- uses: actions/checkout@v4
185183
- name: "Set up JDK ${{ matrix.jdk }}"
186-
uses: actions/setup-java@v3
184+
uses: actions/setup-java@v4
187185
with:
188186
distribution: 'zulu'
189187
java-version: ${{ matrix.jdk }}
@@ -225,7 +223,7 @@ jobs:
225223
env:
226224
JOB_COUNT: 5
227225
steps:
228-
- uses: actions/checkout@v3
226+
- uses: actions/checkout@v4
229227
with:
230228
repository: 'apache/dubbo-samples'
231229
ref: master
@@ -251,7 +249,7 @@ jobs:
251249
jdk: [ 8, 11, 17, 21 ]
252250
job_id: [1, 2, 3, 4, 5]
253251
steps:
254-
- uses: actions/checkout@v3
252+
- uses: actions/checkout@v4
255253
with:
256254
repository: 'apache/dubbo-samples'
257255
ref: master
@@ -294,7 +292,7 @@ jobs:
294292
if: always()
295293
uses: actions/upload-artifact@v4
296294
with:
297-
name: samples-test-result-${{matrix.jdk}}
295+
name: samples-test-result-${{matrix.jdk}}-${{matrix.job_id}}
298296
path: test/jobs/*-result*
299297
samples-test-result:
300298
needs: [samples-test-job]
@@ -306,14 +304,15 @@ jobs:
306304
matrix:
307305
jdk: [ 8, 11, 17, 21 ]
308306
steps:
309-
- uses: actions/checkout@v3
307+
- uses: actions/checkout@v4
310308
with:
311309
repository: 'apache/dubbo-samples'
312310
ref: master
313311
- name: "Download test result"
314312
uses: actions/download-artifact@v4
315313
with:
316-
name: samples-test-result-${{matrix.jdk}}
314+
pattern: samples-test-result-${{matrix.jdk}}-*
315+
github-token: ${{ secrets.GITHUB_TOKEN }}
317316
path: test/jobs/
318317
- name: "Merge test result"
319318
run: ./test/scripts/merge-test-results.sh
@@ -323,7 +322,7 @@ jobs:
323322
env:
324323
JOB_COUNT: 5
325324
steps:
326-
- uses: actions/checkout@v3
325+
- uses: actions/checkout@v4
327326
with:
328327
repository: 'apache/dubbo-integration-cases'
329328
ref: main
@@ -349,7 +348,7 @@ jobs:
349348
jdk: [ 8, 11, 17, 21 ]
350349
job_id: [1, 2, 3, 4, 5]
351350
steps:
352-
- uses: actions/checkout@v3
351+
- uses: actions/checkout@v4
353352
with:
354353
repository: 'apache/dubbo-integration-cases'
355354
ref: main
@@ -392,7 +391,7 @@ jobs:
392391
if: always()
393392
uses: actions/upload-artifact@v4
394393
with:
395-
name: integration-test-result-${{matrix.jdk}}
394+
name: integration-test-result-${{matrix.jdk}}-${{matrix.job_id}}
396395
path: test/jobs/*-result*
397396
integration-test-result:
398397
needs: [integration-test-job]
@@ -404,33 +403,34 @@ jobs:
404403
matrix:
405404
jdk: [ 8, 11, 17, 21 ]
406405
steps:
407-
- uses: actions/checkout@v3
406+
- uses: actions/checkout@v4
408407
with:
409408
repository: 'apache/dubbo-integration-cases'
410409
ref: main
411410
- name: "Download test result"
412411
uses: actions/download-artifact@v4
413412
with:
414-
name: integration-test-result-${{matrix.jdk}}
413+
pattern: integration-test-result-${{matrix.jdk}}-*
414+
github-token: ${{ secrets.GITHUB_TOKEN }}
415415
path: test/jobs/
416416
- name: "Merge test result"
417417
run: ./test/scripts/merge-test-results.sh
418418

419419
error-code-inspecting:
420420
runs-on: ubuntu-latest
421421
steps:
422-
- uses: actions/checkout@v3
422+
- uses: actions/checkout@v4
423423
with:
424424
path: "./dubbo"
425425

426-
- uses: actions/checkout@v3
426+
- uses: actions/checkout@v4
427427
with:
428428
repository: 'apache/dubbo-test-tools'
429429
ref: main
430430
path: "./dubbo-test-tools"
431431

432432
- name: "Set up JDK 21"
433-
uses: actions/setup-java@v3
433+
uses: actions/setup-java@v4
434434
with:
435435
java-version: 21
436436
distribution: 'zulu'
@@ -445,7 +445,6 @@ jobs:
445445
run: |
446446
cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector
447447
../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo
448-
449448
- name: "Upload error code inspection result"
450449
# always() should not be used here, since we don't need to handle the 'canceled' situation.
451450
if: ${{ success() || failure() }}
@@ -457,7 +456,7 @@ jobs:
457456
native-image-inspecting:
458457
runs-on: ubuntu-latest
459458
steps:
460-
- uses: actions/checkout@v3
459+
- uses: actions/checkout@v4
461460
with:
462461
path: "./dubbo"
463462

‎dubbo-dependencies-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
<spotless.action>check</spotless.action>
171171
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
172172
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
173-
<revision>3.2.17-SNAPSHOT</revision>
173+
<revision>3.2.17</revision>
174174
</properties>
175175

176176
<dependencyManagement>

‎dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<packaging>pom</packaging>
3232

3333
<properties>
34-
<revision>3.2.17-SNAPSHOT</revision>
34+
<revision>3.2.17</revision>
3535
<maven_flatten_version>1.6.0</maven_flatten_version>
3636
<curator5_version>5.1.0</curator5_version>
3737
<zookeeper_version>3.8.4</zookeeper_version>

‎dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<packaging>pom</packaging>
3232

3333
<properties>
34-
<revision>3.2.17-SNAPSHOT</revision>
34+
<revision>3.2.17</revision>
3535
<maven_flatten_version>1.6.0</maven_flatten_version>
3636
<curator_version>4.3.0</curator_version>
3737
<zookeeper_version>3.4.14</zookeeper_version>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<spotless.action>check</spotless.action>
170170
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
171171
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
172-
<revision>3.2.17-SNAPSHOT</revision>
172+
<revision>3.2.17</revision>
173173
</properties>
174174

175175
<dependencyManagement>

0 commit comments

Comments
 (0)
⚡