Skip to content

Commit 45548ad

Browse files
authored
Bump to 3.2.1-SNAPSHOT (#333)
* chore: Use the revision tag to conveniently manage version * fix: build test failed * chore: manage dubbo.version * chore: upload logs if test failed * chore: setup java distribution in scenarios test * chore: setup java distribution in scenarios test * chore: setup java distribution in scenarios test * chore: manage dependencies * chore: try to fix triple class not found * chore: revert merge test result * chore: fix merge test result failed * chore: try to merge scenarios test result * chore: try to merge scenarios test result * chore: try to merge scenarios test result * chore: try to merge scenarios test result * chore: try to merge scenarios test result * bump to 3.2.1-SNAPSHOT
1 parent a98b86a commit 45548ad

File tree

83 files changed

+217
-186
lines changed

Some content is hidden

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

83 files changed

+217
-186
lines changed

.github/workflows/conformance.yml

Lines changed: 58 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@ jobs:
2323
name: "Build Extensions"
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
2727
with:
2828
path: dubbo-spi-extensions
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030
with:
3131
repository: 'apache/dubbo'
3232
ref: '3.0'
3333
path: dubbo
3434
- name: Set up JDK 8
35-
uses: actions/setup-java@v1
35+
uses: actions/setup-java@v4
3636
with:
37+
distribution: 'zulu'
3738
java-version: 8
38-
- uses: actions/cache@v2
39+
- uses: actions/cache@v4
3940
name: "Cache local Maven repository"
4041
with:
4142
path: ~/.m2/repository
@@ -52,8 +53,8 @@ jobs:
5253
./mvnw --batch-mode -U -e --no-transfer-progress install -am -DskipTests=true
5354
- name: "Build Scenarios"
5455
run: |
55-
cd ./dubbo-spi-extensions/test/scenarios
56-
../../mvnw --batch-mode -U -e --no-transfer-progress install -am -DskipTests=true
56+
cd ./dubbo-spi-extensions/test
57+
../mvnw --batch-mode -U -e --no-transfer-progress install -am -DskipTests=true
5758
5859
prepare_test:
5960
name: "Prepare Test"
@@ -62,12 +63,12 @@ jobs:
6263
#'JOB_COUNT' MUST match 'job_id' list of 'testjob'
6364
JOB_COUNT: 3
6465
steps:
65-
- uses: actions/checkout@v1
66+
- uses: actions/checkout@v4
6667
- name: Prepare test list
6768
run: |
6869
bash ./test/scripts/prepare-test.sh
6970
- name: Upload test list
70-
uses: actions/upload-artifact@v2
71+
uses: actions/upload-artifact@v4
7172
with:
7273
name: test-list
7374
path: test/jobs
@@ -81,24 +82,26 @@ jobs:
8182
strategy:
8283
fail-fast: false
8384
matrix:
84-
java: [ 8,11 ]
85+
# use the unsafe only run on the jdk8
86+
java: [ 8 ]
8587
#testjob id list MUST match 'JOB_COUNT' of 'prepare_test'
8688
job_id: [ 1,2,3 ]
8789
steps:
88-
- uses: actions/checkout@v1
90+
- uses: actions/checkout@v4
8991
- name: Set up JDK ${{matrix.java}}
90-
uses: actions/setup-java@v1
92+
uses: actions/setup-java@v4
9193
with:
94+
distribution: 'zulu'
9295
java-version: ${{matrix.java}}
9396
- name: Cache local Maven repository
94-
uses: actions/cache@v2
97+
uses: actions/cache@v4
9598
with:
9699
path: ~/.m2/repository
97100
key: ${{ runner.os }}-extensions-maven${{ hashFiles('**/pom.xml') }}
98101
restore-keys: |
99102
${{ runner.os }}-extensions-maven
100103
- name: Download test list
101-
uses: actions/download-artifact@v2
104+
uses: actions/download-artifact@v4
102105
with:
103106
name: test-list
104107
path: test/jobs/
@@ -107,30 +110,59 @@ jobs:
107110
cd test && bash ./build-test-image.sh
108111
- name: Run tests
109112
run: cd test && bash ./run-tests.sh
113+
- name: Upload log if test failed
114+
if: failure()
115+
uses: actions/upload-artifact@v4
116+
with:
117+
name: test-log-${{matrix.java}}-${{matrix.job_id}}
118+
path: "**/test/scenarios/**/logs/*"
110119
- name: Upload test result
111120
if: always()
112-
uses: actions/upload-artifact@v2
121+
uses: actions/upload-artifact@v4
113122
with:
114-
name: test-result
123+
name: test-result-${{matrix.job_id}}
115124
path: test/jobs/*-result*
116125

117-
test_result:
126+
merge_test:
118127
needs: [ testjob ]
119-
name: 'Test Result (Java${{matrix.java}})'
120-
if: always()
128+
name: 'Merge Test Result (Java${{matrix.java}})'
121129
runs-on: ubuntu-latest
122130
strategy:
123131
fail-fast: false
124132
matrix:
125-
java: [ 8,11]
133+
java: [ 8 ]
126134
env:
127135
JAVA_VER: ${{matrix.java}}
128136
steps:
129-
- uses: actions/checkout@v2
130-
- name: Download test result
131-
uses: actions/download-artifact@v2
137+
- name: Merge Artifacts
138+
uses: actions/upload-artifact/merge@v4
132139
with:
133-
name: test-result
134-
path: test/jobs/
135-
- name: Merge test result - java ${{matrix.java}}
136-
run: ./test/scripts/merge-test-results.sh
140+
name: Merge-test-result-Java${{matrix.java}}
141+
separate-directories: true
142+
pattern: test-result-*
143+
delete-merged: true
144+
145+
# test_result:
146+
# needs: [ testjob ]
147+
# name: 'Test Result (Java${{matrix.java}})'
148+
# if: always()
149+
# runs-on: ubuntu-latest
150+
# strategy:
151+
# fail-fast: false
152+
# matrix:
153+
# java: [ 8 ]
154+
# env:
155+
# JAVA_VER: ${{matrix.java}}
156+
# steps:
157+
# - uses: actions/checkout@v4
158+
# - name: Download test result
159+
# uses: actions/download-artifact@v4
160+
# with:
161+
# path: test/jobs/
162+
# - name: Merge test result - java ${{matrix.java}}
163+
# run: ./test/scripts/merge-test-results.sh
164+
# - name: Upload merge test result
165+
# uses: actions/upload-artifact@v4
166+
# with:
167+
# name: merge-test-result-${{matrix.java}}
168+
# path: test/jobs/*-result*

dobbo-doc-auto-gen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

27-
<version>3.2.0</version>
27+
<version>${revision}</version>
2828
<description>Dubbo interface documentation, testing tools</description>
2929

3030
<artifactId>dobbo-doc-auto-gen</artifactId>

dubbo-api-docs/dubbo-api-docs-annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dubbo.extensions</groupId>
2323
<artifactId>dubbo-api-docs</artifactId>
24-
<version>3.2.0</version>
24+
<version>${revision}</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

dubbo-api-docs/dubbo-api-docs-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.dubbo.extensions</groupId>
2424
<artifactId>dubbo-api-docs</artifactId>
25-
<version>3.2.0</version>
25+
<version>${revision}</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
2323
<artifactId>dubbo-api-docs-examples</artifactId>
24-
<version>3.2.0</version>
24+
<version>${revision}</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
2323
<artifactId>dubbo-api-docs-examples</artifactId>
24-
<version>3.2.0</version>
24+
<version>${revision}</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
2323
<artifactId>dubbo-api-docs-examples</artifactId>
24-
<version>3.2.0</version>
24+
<version>${revision}</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

dubbo-api-docs/dubbo-api-docs-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.dubbo.extensions</groupId>
2323
<artifactId>dubbo-api-docs</artifactId>
24-
<version>3.2.0</version>
24+
<version>${revision}</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

dubbo-api-docs/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</parent>
2626

2727
<artifactId>dubbo-api-docs</artifactId>
28-
<version>3.2.0</version>
28+
<version>${revision}</version>
2929
<packaging>pom</packaging>
3030

3131
<name>${project.artifactId}</name>
@@ -47,7 +47,6 @@
4747
<disruptor.version>3.4.2</disruptor.version>
4848
<springfox.version>3.0.0</springfox.version>
4949
<nacos.version>1.4.0</nacos.version>
50-
<dubbo.api.docs.version>3.2.0</dubbo.api.docs.version>
5150
<spring-cloud.version>Hoxton.SR8</spring-cloud.version>
5251
<spring-cloud-alibaba-dependencies.version>2.2.3.RELEASE</spring-cloud-alibaba-dependencies.version>
5352
</properties>

dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<modelVersion>4.0.0</modelVersion>
2828

2929
<artifactId>dubbo-cluster-broadcast-1</artifactId>
30-
<version>3.2.0</version>
30+
<version>${revision}</version>
3131
<packaging>jar</packaging>
3232

3333
<dependencies>

0 commit comments

Comments
 (0)