Skip to content

Commit 2981417

Browse files
RainYuYRainYuY
authored
Merge branch '3.3' into dependabot/maven/junit_platform_version-1.13.3
2 parents 3145e75 + 6ee43ea commit 2981417

File tree

438 files changed

+10432
-1793
lines changed

Some content is hidden

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

438 files changed

+10432
-1793
lines changed

‎.artifacts‎

Lines changed: 2 additions & 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
@@ -56,6 +57,7 @@ dubbo-metrics-registry
5657
dubbo-metrics-config-center
5758
dubbo-metrics-netty
5859
dubbo-metrics-event
60+
dubbo-mutiny
5961
dubbo-native
6062
dubbo-parent
6163
dubbo-plugin

‎.asf.yaml‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,51 @@ github:
3737
# Enable GitHub Discussions for community discussions
3838
discussions: true
3939
protected_branches:
40-
master: {}
41-
2.5.x: {}
42-
2.6.x: {}
43-
2.7.x: {}
44-
3.0: {}
45-
3.1: {}
46-
3.2: {}
47-
3.3: {}
48-
3.4: {}
40+
master:
41+
required_pull_request_reviews:
42+
dismiss_stale_reviews: true
43+
require_last_push_approval: true
44+
required_approving_review_count: 2
45+
2.5.x:
46+
required_pull_request_reviews:
47+
dismiss_stale_reviews: true
48+
require_last_push_approval: true
49+
required_approving_review_count: 2
50+
2.6.x:
51+
required_pull_request_reviews:
52+
dismiss_stale_reviews: true
53+
require_last_push_approval: true
54+
required_approving_review_count: 2
55+
2.7.x:
56+
required_pull_request_reviews:
57+
dismiss_stale_reviews: true
58+
require_last_push_approval: true
59+
required_approving_review_count: 2
60+
3.0:
61+
required_pull_request_reviews:
62+
dismiss_stale_reviews: true
63+
require_last_push_approval: true
64+
required_approving_review_count: 2
65+
3.1:
66+
required_pull_request_reviews:
67+
dismiss_stale_reviews: true
68+
require_last_push_approval: true
69+
required_approving_review_count: 2
70+
3.2:
71+
required_pull_request_reviews:
72+
dismiss_stale_reviews: true
73+
require_last_push_approval: true
74+
required_approving_review_count: 2
75+
3.3:
76+
required_pull_request_reviews:
77+
dismiss_stale_reviews: true
78+
require_last_push_approval: true
79+
required_approving_review_count: 2
80+
3.4:
81+
required_pull_request_reviews:
82+
dismiss_stale_reviews: true
83+
require_last_push_approval: true
84+
required_approving_review_count: 2
4985
labels:
5086
- java
5187
- rpc

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

Lines changed: 48 additions & 36 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,24 +207,29 @@ jobs:
207207
208208
unit-test:
209209
needs: [check-format, unit-test-prepare]
210-
name: "Unit Test On ubuntu-latest"
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
214+
matrix:
215+
java: [ 8, 11, 17, 21, 25 ]
214216
env:
215217
DISABLE_FILE_SYSTEM_TEST: true
216218
CURRENT_ROLE: ${{ matrix.case-role }}
217219
ZOOKEEPER_VERSION: 3.7.2
218220
steps:
221+
- name: "Set MAVEN_OPTS for JDK 24+"
222+
if: ${{ matrix.java >= 24 }}
223+
run: echo "MAVEN_OPTS=--sun-misc-unsafe-memory-access=allow" >> $GITHUB_ENV
219224
- name: "Checkout code"
220225
uses: actions/checkout@v4
221226
with:
222227
fetch-depth: 0
223-
- name: "Set up JDK 21"
228+
- name: "Set up JDK ${{ matrix.java }}"
224229
uses: actions/setup-java@v4
225230
with:
226231
distribution: 'zulu'
227-
java-version: 21
232+
java-version: ${{ matrix.java }}
228233
- name: "Set current date as env variable"
229234
run: echo "TODAY=$(date +'%Y%m%d')" >> $GITHUB_ENV
230235
- name: "Cache local maven repository"
@@ -243,8 +248,15 @@ jobs:
243248
key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }}
244249
restore-keys: |
245250
zookeeper-${{ runner.os }}-
246-
- name: "Test with maven"
251+
- name: "Test with maven on Java: 8"
252+
timeout-minutes: 90
253+
if: ${{ matrix.java == '8' }}
254+
run: |
255+
set -o pipefail
256+
./mvnw ${{ env.MAVEN_ARGS }} clean test verify -Pjacoco,'!jdk15ge-add-open',skip-spotless -DtrimStackTrace=false -Dmaven.test.skip=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper 2>&1 | tee >(grep -n -B 1 -A 200 "FAILURE! -- in" > test_errors.log)
257+
- name: "Test with maven on Java: ${{ matrix.java }}"
247258
timeout-minutes: 90
259+
if: ${{ matrix.java != '8' }}
248260
run: |
249261
set -o pipefail
250262
./mvnw ${{ env.MAVEN_ARGS }} clean test verify -Pjacoco,jdk15ge-simple,'!jdk15ge-add-open',skip-spotless -DtrimStackTrace=false -Dmaven.test.skip=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper 2>&1 | tee >(grep -n -B 1 -A 200 "FAILURE! -- in" > test_errors.log)
@@ -256,18 +268,18 @@ jobs:
256268
with:
257269
token: ${{ secrets.CODECOV_TOKEN }}
258270
verbose: true
259-
flags: unit-tests
271+
flags: unit-tests-java${{ matrix.java }}
260272
env:
261273
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
262274
- name: "Upload surefire reports"
263275
uses: actions/upload-artifact@v4
264276
with:
265-
name: surefire-reports
277+
name: surefire-reports-java${{ matrix.java }}
266278
path: "**/target/surefire-reports/**"
267279

268280
samples-test-prepare:
269281
needs: check-format
270-
runs-on: ubuntu-latest
282+
runs-on: ubuntu-22.04
271283
env:
272284
JOB_COUNT: 3
273285
steps:
@@ -284,16 +296,16 @@ jobs:
284296
path: test/jobs
285297
samples-test-job:
286298
needs: [check-format, build-source, samples-test-prepare]
287-
name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
288-
runs-on: ubuntu-latest
299+
name: "Samples Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
300+
runs-on: ubuntu-22.04
289301
timeout-minutes: 90
290302
env:
291303
JAVA_VER: ${{matrix.java}}
292304
TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
293305
strategy:
294306
fail-fast: false
295307
matrix:
296-
java: [ 8, 17 ]
308+
java: [ 8, 21 ]
297309
job_id: [1,2,3]
298310
steps:
299311
- uses: actions/checkout@v4
@@ -334,7 +346,7 @@ jobs:
334346
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
335347
echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
336348
- name: "Build test image"
337-
run: cd test && bash -c 'DEBIAN_MIRROR=http://archive.debian.org/debian-archive ./build-test-image.sh'
349+
run: cd test && bash -c ./build-test-image.sh
338350
- name: "Run tests"
339351
run: cd test && bash ./run-tests.sh
340352
- name: "merge jacoco result"
@@ -358,14 +370,14 @@ jobs:
358370
path: test/logs/*
359371
samples-test-result:
360372
needs: [check-format, samples-test-job]
361-
name: "Samples Test Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
373+
name: "Samples Test Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
362374
if: always()
363-
runs-on: ubuntu-latest
375+
runs-on: ubuntu-22.04
364376
env:
365377
JAVA_VER: ${{matrix.java}}
366378
strategy:
367379
matrix:
368-
java: [ 8, 17 ]
380+
java: [ 8, 21 ]
369381
steps:
370382
- uses: actions/checkout@v4
371383
with:
@@ -382,7 +394,7 @@ jobs:
382394

383395
integration-test-prepare:
384396
needs: check-format
385-
runs-on: ubuntu-latest
397+
runs-on: ubuntu-22.04
386398
env:
387399
JOB_COUNT: 3
388400
steps:
@@ -399,16 +411,16 @@ jobs:
399411
path: test/jobs
400412
integration-test-job:
401413
needs: [check-format, build-source, integration-test-prepare]
402-
name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
403-
runs-on: ubuntu-latest
414+
name: "Integration Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
415+
runs-on: ubuntu-22.04
404416
timeout-minutes: 90
405417
env:
406418
JAVA_VER: ${{matrix.java}}
407419
TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
408420
strategy:
409421
fail-fast: false
410422
matrix:
411-
java: [ 8, 17 ]
423+
java: [ 8, 21 ]
412424
job_id: [1,2,3]
413425
steps:
414426
- uses: actions/checkout@v4
@@ -449,7 +461,7 @@ jobs:
449461
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
450462
echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
451463
- name: "Build test image"
452-
run: cd test && bash -c 'DEBIAN_MIRROR=http://archive.debian.org/debian-archive ./build-test-image.sh'
464+
run: cd test && bash -c ./build-test-image.sh
453465
- name: "Run tests"
454466
run: cd test && bash ./run-tests.sh
455467
- name: "merge jacoco result"
@@ -472,15 +484,15 @@ jobs:
472484
name: integration-test-logs-${{matrix.job_id}}-java${{matrix.java}}
473485
path: test/logs/*
474486
integration-test-result:
475-
name: "Integration Test Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
487+
name: "Integration Test Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
476488
needs: [check-format, integration-test-job]
477489
if: always()
478-
runs-on: ubuntu-latest
490+
runs-on: ubuntu-22.04
479491
env:
480492
JAVA_VER: ${{matrix.java}}
481493
strategy:
482494
matrix:
483-
java: [ 8, 17 ]
495+
java: [ 8, 21 ]
484496
steps:
485497
- uses: actions/checkout@v4
486498
with:
@@ -496,12 +508,12 @@ jobs:
496508
run: ./test/scripts/merge-test-results.sh
497509

498510
samples-jacoco-result-merge:
499-
name: "Samples Jacoco Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
500-
runs-on: ubuntu-latest
511+
name: "Samples Jacoco Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
512+
runs-on: ubuntu-22.04
501513
needs: [check-format, samples-test-result]
502514
strategy:
503515
matrix:
504-
java: [ 8, 17 ]
516+
java: [ 8, 21 ]
505517
steps:
506518
- uses: actions/checkout@v4
507519
- uses: actions/checkout@v4
@@ -546,12 +558,12 @@ jobs:
546558
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
547559

548560
integration-jacoco-result-merge:
549-
name: "Integration Jacoco Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
550-
runs-on: ubuntu-latest
561+
name: "Integration Jacoco Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
562+
runs-on: ubuntu-22.04
551563
needs: [check-format, integration-test-result, samples-test-result]
552564
strategy:
553565
matrix:
554-
java: [ 8, 17 ]
566+
java: [ 8, 21 ]
555567
steps:
556568
- uses: actions/checkout@v4
557569
- uses: actions/checkout@v4
@@ -598,7 +610,7 @@ jobs:
598610

599611
error-code-inspecting:
600612
needs: check-format
601-
runs-on: ubuntu-latest
613+
runs-on: ubuntu-22.04
602614
steps:
603615
- uses: actions/checkout@v4
604616
with:
@@ -642,7 +654,7 @@ jobs:
642654

643655
native-image-inspecting:
644656
needs: check-format
645-
runs-on: ubuntu-latest
657+
runs-on: ubuntu-22.04
646658
steps:
647659
- uses: actions/checkout@v4
648660
with:
@@ -657,7 +669,7 @@ jobs:
657669
native-image-job-reports: 'true'
658670
- name: "Set up Zookeeper environment"
659671
run: |
660-
wget -t 1 -T 120 https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
672+
wget -t 1 -T 120 https://archive.apache.org/dist/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
661673
tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz
662674
mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg
663675
apache-zookeeper-3.8.4-bin/bin/zkServer.sh start

0 commit comments

Comments
 (0)