Skip to content

Commit 70d8bb2

Browse files
qxgggqxggg
authored
Merge branch '3.3' into fix-issue-15698
2 parents a15873e + adc6143 commit 70d8bb2

104 files changed

Lines changed: 6673 additions & 784 deletions

File tree

Some content is hidden

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

‎.artifacts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dubbo-filter-cache
4141
dubbo-filter-validation
4242
dubbo-kubernetes
4343
dubbo-maven-plugin
44+
dubbo-mcp
4445
dubbo-metadata
4546
dubbo-metadata-api
4647
dubbo-metadata-definition-protobuf

‎.github/workflows/build-and-test-pr.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535
jobs:
3636
check-format:
3737
name: "Check if code needs formatting"
38-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-22.04
3939
steps:
4040
- name: "Checkout"
4141
uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
7676
license:
7777
name: "Check License"
7878
needs: check-format
79-
runs-on: ubuntu-latest
79+
runs-on: ubuntu-22.04
8080
steps:
8181
- uses: actions/checkout@v4
8282
- name: "Check License"
@@ -102,7 +102,7 @@ jobs:
102102
build-source:
103103
name: "Build Dubbo"
104104
needs: check-format
105-
runs-on: ubuntu-latest
105+
runs-on: ubuntu-22.04
106106
outputs:
107107
version: ${{ steps.dubbo-version.outputs.version }}
108108
steps:
@@ -175,7 +175,7 @@ jobs:
175175
unit-test-prepare:
176176
name: "Preparation for Unit Test"
177177
needs: check-format
178-
runs-on: ubuntu-latest
178+
runs-on: ubuntu-22.04
179179
strategy:
180180
fail-fast: false
181181
env:
@@ -207,8 +207,8 @@ jobs:
207207
208208
unit-test:
209209
needs: [check-format, unit-test-prepare]
210-
name: "Unit Test On ubuntu-latest Java: ${{ matrix.java }}"
211-
runs-on: ubuntu-latest
210+
name: "Unit Test On ubuntu-22.04 Java: ${{ matrix.java }}"
211+
runs-on: ubuntu-22.04
212212
strategy:
213213
fail-fast: false
214214
matrix:
@@ -276,7 +276,7 @@ jobs:
276276

277277
samples-test-prepare:
278278
needs: check-format
279-
runs-on: ubuntu-latest
279+
runs-on: ubuntu-22.04
280280
env:
281281
JOB_COUNT: 3
282282
steps:
@@ -293,8 +293,8 @@ jobs:
293293
path: test/jobs
294294
samples-test-job:
295295
needs: [check-format, build-source, samples-test-prepare]
296-
name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
297-
runs-on: ubuntu-latest
296+
name: "Samples Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
297+
runs-on: ubuntu-22.04
298298
timeout-minutes: 90
299299
env:
300300
JAVA_VER: ${{matrix.java}}
@@ -367,9 +367,9 @@ jobs:
367367
path: test/logs/*
368368
samples-test-result:
369369
needs: [check-format, samples-test-job]
370-
name: "Samples Test Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
370+
name: "Samples Test Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
371371
if: always()
372-
runs-on: ubuntu-latest
372+
runs-on: ubuntu-22.04
373373
env:
374374
JAVA_VER: ${{matrix.java}}
375375
strategy:
@@ -391,7 +391,7 @@ jobs:
391391

392392
integration-test-prepare:
393393
needs: check-format
394-
runs-on: ubuntu-latest
394+
runs-on: ubuntu-22.04
395395
env:
396396
JOB_COUNT: 3
397397
steps:
@@ -408,8 +408,8 @@ jobs:
408408
path: test/jobs
409409
integration-test-job:
410410
needs: [check-format, build-source, integration-test-prepare]
411-
name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
412-
runs-on: ubuntu-latest
411+
name: "Integration Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
412+
runs-on: ubuntu-22.04
413413
timeout-minutes: 90
414414
env:
415415
JAVA_VER: ${{matrix.java}}
@@ -481,10 +481,10 @@ jobs:
481481
name: integration-test-logs-${{matrix.job_id}}-java${{matrix.java}}
482482
path: test/logs/*
483483
integration-test-result:
484-
name: "Integration Test Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
484+
name: "Integration Test Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
485485
needs: [check-format, integration-test-job]
486486
if: always()
487-
runs-on: ubuntu-latest
487+
runs-on: ubuntu-22.04
488488
env:
489489
JAVA_VER: ${{matrix.java}}
490490
strategy:
@@ -505,8 +505,8 @@ jobs:
505505
run: ./test/scripts/merge-test-results.sh
506506

507507
samples-jacoco-result-merge:
508-
name: "Samples Jacoco Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
509-
runs-on: ubuntu-latest
508+
name: "Samples Jacoco Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
509+
runs-on: ubuntu-22.04
510510
needs: [check-format, samples-test-result]
511511
strategy:
512512
matrix:
@@ -555,8 +555,8 @@ jobs:
555555
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
556556

557557
integration-jacoco-result-merge:
558-
name: "Integration Jacoco Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
559-
runs-on: ubuntu-latest
558+
name: "Integration Jacoco Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
559+
runs-on: ubuntu-22.04
560560
needs: [check-format, integration-test-result, samples-test-result]
561561
strategy:
562562
matrix:
@@ -607,7 +607,7 @@ jobs:
607607

608608
error-code-inspecting:
609609
needs: check-format
610-
runs-on: ubuntu-latest
610+
runs-on: ubuntu-22.04
611611
steps:
612612
- uses: actions/checkout@v4
613613
with:
@@ -651,7 +651,7 @@ jobs:
651651

652652
native-image-inspecting:
653653
needs: check-format
654-
runs-on: ubuntu-latest
654+
runs-on: ubuntu-22.04
655655
steps:
656656
- uses: actions/checkout@v4
657657
with:
@@ -666,7 +666,7 @@ jobs:
666666
native-image-job-reports: 'true'
667667
- name: "Set up Zookeeper environment"
668668
run: |
669-
wget -t 1 -T 120 https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
669+
wget -t 1 -T 120 https://archive.apache.org/dist/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
670670
tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz
671671
mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg
672672
apache-zookeeper-3.8.4-bin/bin/zkServer.sh start

‎.github/workflows/build-and-test-scheduled-3.1.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222

2323
jobs:
2424
license:
25-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- uses: actions/checkout@v4
2828
with:
@@ -32,7 +32,7 @@ jobs:
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434
build-source:
35-
runs-on: ubuntu-latest
35+
runs-on: ubuntu-22.04
3636
outputs:
3737
version: ${{ steps.dubbo-version.outputs.version }}
3838
steps:
@@ -83,7 +83,7 @@ jobs:
8383
strategy:
8484
fail-fast: false
8585
matrix:
86-
os: [ ubuntu-latest, windows-latest ]
86+
os: [ ubuntu-22.04, windows-latest ]
8787
env:
8888
ZOOKEEPER_VERSION: 3.7.2
8989
steps:
@@ -131,7 +131,7 @@ jobs:
131131
strategy:
132132
fail-fast: false
133133
matrix:
134-
os: [ ubuntu-latest, windows-latest ]
134+
os: [ ubuntu-22.04, windows-latest ]
135135
jdk: [ 8, 11, 17, 21 ]
136136
env:
137137
DISABLE_FILE_SYSTEM_TEST: true
@@ -175,7 +175,7 @@ jobs:
175175
strategy:
176176
fail-fast: false
177177
matrix:
178-
os: [ ubuntu-latest, windows-latest ]
178+
os: [ ubuntu-22.04, windows-latest ]
179179
jdk: [ 8, 11, 17, 21 ]
180180
env:
181181
DISABLE_FILE_SYSTEM_TEST: true
@@ -222,7 +222,7 @@ jobs:
222222
run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -P"jacoco,'!jdk15ge'" -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true" -D"embeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper"
223223

224224
samples-test-prepare:
225-
runs-on: ubuntu-latest
225+
runs-on: ubuntu-22.04
226226
env:
227227
JOB_COUNT: 5
228228
steps:
@@ -240,8 +240,8 @@ jobs:
240240
path: test/jobs
241241
samples-test-job:
242242
needs: [build-source, samples-test-prepare]
243-
name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} JavaVer: ${{matrix.jdk}})"
244-
runs-on: ubuntu-latest
243+
name: "Samples Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} JavaVer: ${{matrix.jdk}})"
244+
runs-on: ubuntu-22.04
245245
timeout-minutes: 90
246246
env:
247247
JAVA_VER: ${{matrix.jdk}}
@@ -306,7 +306,7 @@ jobs:
306306
samples-test-result:
307307
needs: [samples-test-job]
308308
if: always()
309-
runs-on: ubuntu-latest
309+
runs-on: ubuntu-22.04
310310
env:
311311
JAVA_VER: ${{matrix.jdk}}
312312
strategy:
@@ -328,7 +328,7 @@ jobs:
328328
run: ./test/scripts/merge-test-results.sh
329329

330330
integration-test-prepare:
331-
runs-on: ubuntu-latest
331+
runs-on: ubuntu-22.04
332332
env:
333333
JOB_COUNT: 5
334334
steps:
@@ -346,8 +346,8 @@ jobs:
346346
path: test/jobs
347347
integration-test-job:
348348
needs: [build-source, integration-test-prepare]
349-
name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}} JavaVer: ${{matrix.jdk}})"
350-
runs-on: ubuntu-latest
349+
name: "Integration Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} JavaVer: ${{matrix.jdk}})"
350+
runs-on: ubuntu-22.04
351351
timeout-minutes: 90
352352
env:
353353
JAVA_VER: ${{matrix.jdk}}
@@ -412,7 +412,7 @@ jobs:
412412
integration-test-result:
413413
needs: [integration-test-job]
414414
if: always()
415-
runs-on: ubuntu-latest
415+
runs-on: ubuntu-22.04
416416
env:
417417
JAVA_VER: ${{matrix.jdk}}
418418
strategy:
@@ -434,7 +434,7 @@ jobs:
434434
run: ./test/scripts/merge-test-results.sh
435435

436436
error-code-inspecting:
437-
runs-on: ubuntu-latest
437+
runs-on: ubuntu-22.04
438438
steps:
439439
- uses: actions/checkout@v4
440440
with:
@@ -473,7 +473,7 @@ jobs:
473473
path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt
474474

475475
native-image-inspecting:
476-
runs-on: ubuntu-latest
476+
runs-on: ubuntu-22.04
477477
steps:
478478
- uses: actions/checkout@v4
479479
with:
@@ -491,7 +491,7 @@ jobs:
491491

492492
- name: "Setup Zookeeper environment"
493493
run: |
494-
wget -t 1 -T 120 https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
494+
wget -t 1 -T 120 https://archive.apache.org/dist/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
495495
tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz
496496
mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg
497497
apache-zookeeper-3.8.4-bin/bin/zkServer.sh start

0 commit comments

Comments
 (0)