Skip to content

Commit 3028b75

Browse files
zrlwzrlw
authored
Merge branch 'master' into master
2 parents 7ddd849 + 9c864a7 commit 3028b75

303 files changed

Lines changed: 8187 additions & 6422 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.

‎.github/workflows/dubbo-3_2.yml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,21 @@ env:
3131
jobs:
3232
build-samples:
3333
needs: [build-dubbo]
34-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-22.04
3535
strategy:
3636
fail-fast: false
3737
steps:
38+
# Refer to https://github.com/actions/runner-images/issues/2840
39+
# Current dubbo-samples is too huge and `System.IO.IOException: No space left on device` will be thrown
40+
# during building it on current github-hosted running system, it should be split into two or more small
41+
# projects in the future.
42+
# For now, we should clean some unnecessary system files to make room for the building action.
43+
- name: Clean unnecessary system files
44+
run: |
45+
sudo rm -rf /usr/share/dotnet
46+
sudo rm -rf /opt/ghc
47+
sudo rm -rf /usr/local/share/boost
48+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
3849
- uses: actions/checkout@v3
3950
- name: Cache local Maven repository
4051
uses: actions/cache@v3
@@ -43,20 +54,31 @@ jobs:
4354
key: ${{ runner.os }}-samples-maven-${{ hashFiles('**/pom.xml') }}
4455
restore-keys: |
4556
${{ runner.os }}-samples-maven-
57+
- name: Dubbo cache
58+
uses: actions/cache@v3
59+
with:
60+
path: ~/.m2/repository/org/apache/dubbo
61+
key: ${{ runner.os }}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
4662
- name: Set up JDK 21
4763
uses: actions/setup-java@v3
4864
with:
4965
distribution: 'zulu'
5066
java-version: 21
67+
- name: Filter modules by Dubbo version
68+
id: filter-modules
69+
run: |
70+
EXCLUDED=$(bash ./test/scripts/filter-build-modules.sh ${{ needs.build-dubbo.outputs.version }})
71+
echo "excluded_modules=$EXCLUDED" >> $GITHUB_OUTPUT
72+
echo "Excluded modules: $EXCLUDED"
5173
- name: Build with Maven
5274
run: |
53-
./mvnw $BUILD_OPTS
75+
./mvnw $BUILD_OPTS ${{ steps.filter-modules.outputs.excluded_modules }}
5476
- name: Clean with Maven
5577
run: |
5678
./mvnw --batch-mode --no-snapshot-updates --no-transfer-progress --settings ${{github.workspace}}/.mvn/settings.xml clean
5779
5880
build-dubbo:
59-
runs-on: ubuntu-latest
81+
runs-on: ubuntu-22.04
6082
strategy:
6183
fail-fast: false
6284
# Map a step output to a job output
@@ -106,7 +128,7 @@ jobs:
106128
./mvnw --batch-mode --no-snapshot-updates --no-transfer-progress clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
107129
108130
prepare_test:
109-
runs-on: ubuntu-latest
131+
runs-on: ubuntu-22.04
110132
env:
111133
#'JOB_COUNT' MUST match 'job_id' list of 'testjob'
112134
JOB_COUNT: 5
@@ -169,7 +191,7 @@ jobs:
169191
testjob:
170192
needs: [prepare_test, build-dubbo]
171193
name: 'Integration Test (Java${{matrix.java}}, Job${{matrix.job_id}})'
172-
runs-on: ubuntu-latest
194+
runs-on: ubuntu-22.04
173195
env:
174196
JAVA_VER: ${{matrix.java}}
175197
TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
@@ -225,7 +247,7 @@ jobs:
225247
needs: [testjob]
226248
name: 'Test Result (Java${{matrix.java}})'
227249
if: always()
228-
runs-on: ubuntu-latest
250+
runs-on: ubuntu-22.04
229251
strategy:
230252
fail-fast: false
231253
matrix:

‎.github/workflows/dubbo-3_3.yml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,21 @@ env:
2929
jobs:
3030
build-samples:
3131
needs: [build-dubbo]
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-22.04
3333
strategy:
3434
fail-fast: false
3535
steps:
36+
# Refer to https://github.com/actions/runner-images/issues/2840
37+
# Current dubbo-samples is too huge and `System.IO.IOException: No space left on device` will be thrown
38+
# during building it on current github-hosted running system, it should be split into two or more small
39+
# projects in the future.
40+
# For now, we should clean some unnecessary system files to make room for the building action.
41+
- name: Clean unnecessary system files
42+
run: |
43+
sudo rm -rf /usr/share/dotnet
44+
sudo rm -rf /opt/ghc
45+
sudo rm -rf /usr/local/share/boost
46+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
3647
- uses: actions/checkout@v3
3748
- name: Cache local Maven repository
3849
uses: actions/cache@v3
@@ -41,20 +52,31 @@ jobs:
4152
key: ${{ runner.os }}-samples-maven-${{ hashFiles('**/pom.xml') }}
4253
restore-keys: |
4354
${{ runner.os }}-samples-maven-
55+
- name: Dubbo cache
56+
uses: actions/cache@v3
57+
with:
58+
path: ~/.m2/repository/org/apache/dubbo
59+
key: ${{ runner.os }}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
4460
- name: Set up JDK 21
4561
uses: actions/setup-java@v3
4662
with:
4763
distribution: 'zulu'
4864
java-version: 21
65+
- name: Filter modules by Dubbo version
66+
id: filter-modules
67+
run: |
68+
EXCLUDED=$(bash ./test/scripts/filter-build-modules.sh ${{ needs.build-dubbo.outputs.version }})
69+
echo "excluded_modules=$EXCLUDED" >> $GITHUB_OUTPUT
70+
echo "Excluded modules: $EXCLUDED"
4971
- name: Build with Maven
5072
run: |
51-
./mvnw $BUILD_OPTS
73+
./mvnw $BUILD_OPTS ${{ steps.filter-modules.outputs.excluded_modules }}
5274
- name: Clean with Maven
5375
run: |
5476
./mvnw --batch-mode --no-snapshot-updates --no-transfer-progress --settings ${{github.workspace}}/.mvn/settings.xml clean
5577
5678
build-dubbo:
57-
runs-on: ubuntu-latest
79+
runs-on: ubuntu-22.04
5880
strategy:
5981
fail-fast: false
6082
outputs:
@@ -100,7 +122,7 @@ jobs:
100122
./mvnw --batch-mode --no-snapshot-updates --no-transfer-progress clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
101123
102124
prepare_test:
103-
runs-on: ubuntu-latest
125+
runs-on: ubuntu-22.04
104126
env:
105127
JOB_COUNT: 5
106128
steps:
@@ -162,7 +184,7 @@ jobs:
162184
testjob:
163185
needs: [prepare_test, build-dubbo]
164186
name: 'Integration Test (Java${{matrix.java}}, Job${{matrix.job_id}})'
165-
runs-on: ubuntu-latest
187+
runs-on: ubuntu-22.04
166188
env:
167189
JAVA_VER: ${{matrix.java}}
168190
TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
@@ -217,7 +239,7 @@ jobs:
217239
needs: [testjob]
218240
name: 'Test Result (Java${{matrix.java}})'
219241
if: always()
220-
runs-on: ubuntu-latest
242+
runs-on: ubuntu-22.04
221243
strategy:
222244
fail-fast: false
223245
matrix:

‎.github/workflows/license.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77

88
jobs:
99
license:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- uses: actions/checkout@v3
1313
- name: Check License

‎.github/workflows/nightly-dubbo-3.yml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,23 @@ env:
3232

3333
jobs:
3434
build-samples:
35-
runs-on: ubuntu-latest
35+
runs-on: ubuntu-22.04
3636
strategy:
3737
fail-fast: false
3838
matrix:
3939
java: [8, 11]
4040
steps:
41+
# Refer to https://github.com/actions/runner-images/issues/2840
42+
# Current dubbo-samples is too huge and `System.IO.IOException: No space left on device` will be thrown
43+
# during building it on current github-hosted running system, it should be split into two or more small
44+
# projects in the future.
45+
# For now, we should clean some unnecessary system files to make room for the building action.
46+
- name: Clean unnecessary system files
47+
run: |
48+
sudo rm -rf /usr/share/dotnet
49+
sudo rm -rf /opt/ghc
50+
sudo rm -rf /usr/local/share/boost
51+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
4152
- uses: actions/checkout@v3
4253
- name: Cache local Maven repository
4354
uses: actions/cache@v3
@@ -56,7 +67,7 @@ jobs:
5667
./mvnw $BUILD_OPTS
5768
5869
build-dubbo:
59-
runs-on: ubuntu-latest
70+
runs-on: ubuntu-22.04
6071
strategy:
6172
fail-fast: false
6273
# Map a step output to a job output
@@ -106,7 +117,7 @@ jobs:
106117
./mvnw --batch-mode --no-snapshot-updates --no-transfer-progress clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
107118
108119
prepare_test:
109-
runs-on: ubuntu-latest
120+
runs-on: ubuntu-22.04
110121
env:
111122
#'JOB_COUNT' MUST match 'job_id' list of 'testjob'
112123
JOB_COUNT: 5
@@ -124,7 +135,7 @@ jobs:
124135
testjob:
125136
needs: [prepare_test, build-dubbo]
126137
name: 'Integration Test (Java${{matrix.java}}, Job${{matrix.job_id}})'
127-
runs-on: ubuntu-latest
138+
runs-on: ubuntu-22.04
128139
env:
129140
JAVA_VER: ${{matrix.java}}
130141
TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
@@ -179,7 +190,7 @@ jobs:
179190
needs: [testjob]
180191
name: 'Test Result (Java${{matrix.java}})'
181192
if: always()
182-
runs-on: ubuntu-latest
193+
runs-on: ubuntu-22.04
183194
strategy:
184195
fail-fast: false
185196
matrix:

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# maven ignore
22
target/
3+
4+
# gradle ignore
5+
build/
36
*.jar
47
*.war
58
*.zip

‎.licenserc.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ header:
2626
- '**/.project'
2727
- '**/target/**'
2828
- '**/generated/**'
29+
- '**/.openapi-generator/**'
2930
- '**/*.log'
3031
- '**/codestyle/*'
3132
- '**/resources/META-INF/**'

0 commit comments

Comments
 (0)