This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new e95c4b50ab Enhance Github Actions Workflow Speed (#10779)
e95c4b50ab is described below
commit e95c4b50ab4718c21d572ce9fc308293182c258e
Author: Albumen Kevin <[email protected]>
AuthorDate: Sat Oct 22 15:42:10 2022 +0800
Enhance Github Actions Workflow Speed (#10779)
---
...uild-and-test-3.1.yml => build-and-test-pr.yml} | 101 +++++--------------
...st-3.1.yml => build-and-test-scheduled-3.0.yml} | 107 +++++----------------
...st-3.1.yml => build-and-test-scheduled-3.1.yml} | 47 ++++++---
...st-3.1.yml => build-and-test-scheduled-3.2.yml} | 46 ++++++---
.../collector/DefaultMetricsCollectorTest.java | 6 +-
dubbo-dependencies-bom/pom.xml | 4 +-
6 files changed, 116 insertions(+), 195 deletions(-)
diff --git a/.github/workflows/build-and-test-3.1.yml
b/.github/workflows/build-and-test-pr.yml
similarity index 66%
copy from .github/workflows/build-and-test-3.1.yml
copy to .github/workflows/build-and-test-pr.yml
index e9ae3f8c0d..a1673482de 100644
--- a/.github/workflows/build-and-test-3.1.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@ -1,4 +1,4 @@
-name: Build and Test For Dubbo 3.1
+name: Build and Test For PR
on: [push, pull_request, workflow_dispatch]
@@ -41,12 +41,15 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
- name: "Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
- name: "Build Dubbo with Maven"
run: |
cd ./dubbo
@@ -77,15 +80,11 @@ jobs:
echo "dubbo version: $REVISION"
unit-test-prepare:
- name: " Preparation for Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk
}})"
- runs-on: ${{ matrix.os }}
+ name: "Preparation for Unit Test"
+ runs-on: ubuntu-20.04
strategy:
fail-fast: false
- matrix:
- os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
env:
- DISABLE_FILE_SYSTEM_TEST: true
ZOOKEEPER_VERSION: 3.6.3
steps:
- uses: actions/cache@v2
@@ -102,20 +101,6 @@ jobs:
with:
release: false # support cache, see
https://github.com/msys2/setup-msys2#context
- name: "Download zookeeper binary archive in Linux OS"
- if: ${{ startsWith( matrix.os, 'ubuntu') &&
steps.cache-zookeeper.outputs.cache-hit != 'true' }}
- run: |
- mkdir -p ${{ github.workspace }}/.tmp/zookeeper
- wget -c https://archive.apache.org/dist/zookeeper/zookeeper-${{
env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION
}}-bin.tar.gz -O ${{ github.workspace
}}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
- wget -c https://apache.website-solution.net/zookeeper/zookeeper-${{
env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION
}}-bin.tar.gz -O ${{ github.workspace
}}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
- wget -c http://apache.stu.edu.tw/zookeeper/zookeeper-${{
env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION
}}-bin.tar.gz -O ${{ github.workspace
}}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
- wget -c http://ftp.jaist.ac.jp/pub/apache/zookeeper/zookeeper-${{
env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION
}}-bin.tar.gz -O ${{ github.workspace
}}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
- wget -c http://apache.mirror.cdnetworks.com/zookeeper/zookeeper-${{
env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION
}}-bin.tar.gz -O ${{ github.workspace
}}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
- 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
- echo "list the downloaded zookeeper binary archive"
- ls -al ${{ github.workspace
}}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz
- - name: "Download zookeeper binary archive in Windows OS"
- if: ${{ startsWith( matrix.os, 'windows') &&
steps.cache-zookeeper.outputs.cache-hit != 'true' }}
- shell: msys2 {0}
run: |
mkdir -p ${{ github.workspace }}/.tmp/zookeeper
wget -c https://archive.apache.org/dist/zookeeper/zookeeper-${{
env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION
}}-bin.tar.gz -O ${{ github.workspace
}}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
@@ -129,73 +114,30 @@ jobs:
unit-test:
needs: [build-source, unit-test-prepare]
- name: "Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk }})"
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
- env:
- DISABLE_FILE_SYSTEM_TEST: true
- steps:
- - uses: actions/checkout@v2
- - name: "Set up JDK ${{ matrix.jdk }}"
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.jdk }}
- - uses: actions/cache@v2
- name: "Cache local Maven repository"
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - name: "Test with Maven with Integration Tests"
- timeout-minutes: 70
- if: ${{ startsWith( matrix.os, 'ubuntu') }}
- run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false
-DskipIntegrationTests=false -Dcheckstyle.skip=false
-Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
-DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- - name: "Test with Maven without Integration Tests"
- timeout-minutes: 90
- if: ${{ startsWith( matrix.os, 'windows') }}
- run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-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"
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v1
-
- unit-test-fastjson2:
- needs: [build-source, unit-test-prepare]
- name: "Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk }},
Serialization: fastjson2)"
- runs-on: ${{ matrix.os }}
+ name: "Unit Test On ubuntu-20.04"
+ runs-on: ubuntu-20.04
strategy:
fail-fast: false
- matrix:
- os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
env:
DISABLE_FILE_SYSTEM_TEST: true
- DUBBO_DEFAULT_SERIALIZATION: fastjson2
- MAVEN_SUREFIRE_ADD_OPENS: true
+ CURRENT_ROLE: ${{ matrix.case-role }}
steps:
- uses: actions/checkout@v2
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1
with:
- java-version: ${{ matrix.jdk }}
+ java-version: 17
- uses: actions/cache@v2
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Test with Maven with Integration Tests"
timeout-minutes: 70
- if: ${{ startsWith( matrix.os, 'ubuntu') }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false
-DskipIntegrationTests=false -Dcheckstyle.skip=false
-Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
-DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- - name: "Test with Maven without Integration Tests"
- timeout-minutes: 90
- if: ${{ startsWith( matrix.os, 'windows') }}
- run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-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"
- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v1
@@ -238,14 +180,18 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Restore Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
- name: "Download test list"
uses: actions/download-artifact@v2
with:
@@ -297,7 +243,7 @@ jobs:
- uses: actions/checkout@v2
with:
path: "./dubbo"
-
+
- uses: actions/checkout@v2
with:
repository: 'apache/dubbo-test-tools'
@@ -308,19 +254,18 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 17
-
+
- name: "Compile Dubbo (Linux)"
run: |
cd ${{ github.workspace }}/dubbo
./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
-
- name: "Run Error Code Inspecting"
env:
"dubbo.eci.report-as-error": false
run: |
cd ${{ github.workspace
}}/dubbo-test-tools/dubbo-error-code-inspector
../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C package exec:java -Dmaven.test.skip=true
-Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo
-
+
- name: "Upload error code inspection result"
uses: actions/upload-artifact@v2
with:
diff --git a/.github/workflows/build-and-test-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.0.yml
similarity index 75%
copy from .github/workflows/build-and-test-3.1.yml
copy to .github/workflows/build-and-test-scheduled-3.0.yml
index e9ae3f8c0d..9ade11e0d7 100644
--- a/.github/workflows/build-and-test-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.0.yml
@@ -1,6 +1,9 @@
-name: Build and Test For Dubbo 3.1
+name: Build and Test Scheduled On 3.0
-on: [push, pull_request, workflow_dispatch]
+on:
+ schedule:
+ - cron: '0 0 */6 * *'
+ workflow_dispatch:
permissions:
contents: read
@@ -22,6 +25,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 3.0
- name: Check License
uses: apache/skywalking-eyes@main
env:
@@ -33,6 +38,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
+ ref: 3.0
path: dubbo
- uses: actions/setup-java@v1
with:
@@ -41,12 +47,15 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
- name: "Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
- name: "Build Dubbo with Maven"
run: |
cd ./dubbo
@@ -77,15 +86,13 @@ jobs:
echo "dubbo version: $REVISION"
unit-test-prepare:
- name: " Preparation for Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk
}})"
+ name: " Preparation for Unit Test On ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
env:
- DISABLE_FILE_SYSTEM_TEST: true
ZOOKEEPER_VERSION: 3.6.3
steps:
- uses: actions/cache@v2
@@ -135,48 +142,13 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
+ jdk: [ 8, 11, 17 ]
env:
DISABLE_FILE_SYSTEM_TEST: true
steps:
- uses: actions/checkout@v2
- - name: "Set up JDK ${{ matrix.jdk }}"
- uses: actions/setup-java@v1
with:
- java-version: ${{ matrix.jdk }}
- - uses: actions/cache@v2
- name: "Cache local Maven repository"
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - name: "Test with Maven with Integration Tests"
- timeout-minutes: 70
- if: ${{ startsWith( matrix.os, 'ubuntu') }}
- run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false
-DskipIntegrationTests=false -Dcheckstyle.skip=false
-Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
-DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- - name: "Test with Maven without Integration Tests"
- timeout-minutes: 90
- if: ${{ startsWith( matrix.os, 'windows') }}
- run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-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"
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v1
-
- unit-test-fastjson2:
- needs: [build-source, unit-test-prepare]
- name: "Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk }},
Serialization: fastjson2)"
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
- env:
- DISABLE_FILE_SYSTEM_TEST: true
- DUBBO_DEFAULT_SERIALIZATION: fastjson2
- MAVEN_SUREFIRE_ADD_OPENS: true
- steps:
- - uses: actions/checkout@v2
+ ref: 3.0
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1
with:
@@ -185,8 +157,9 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Test with Maven with Integration Tests"
timeout-minutes: 70
@@ -238,14 +211,18 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Restore Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
- name: "Download test list"
uses: actions/download-artifact@v2
with:
@@ -290,39 +267,3 @@ jobs:
path: test/jobs/
- name: "Merge test result"
run: ./test/scripts/merge-test-results.sh
-
- error-code-inspecting:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- with:
- path: "./dubbo"
-
- - uses: actions/checkout@v2
- with:
- repository: 'apache/dubbo-test-tools'
- ref: main
- path: "./dubbo-test-tools"
-
- - name: "Set up JDK 17"
- uses: actions/setup-java@v1
- with:
- java-version: 17
-
- - name: "Compile Dubbo (Linux)"
- run: |
- cd ${{ github.workspace }}/dubbo
- ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
-
- - name: "Run Error Code Inspecting"
- env:
- "dubbo.eci.report-as-error": false
- run: |
- cd ${{ github.workspace
}}/dubbo-test-tools/dubbo-error-code-inspector
- ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C package exec:java -Dmaven.test.skip=true
-Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo
-
- - name: "Upload error code inspection result"
- uses: actions/upload-artifact@v2
- with:
- name: "error-inspection-result"
- path: ${{ github.workspace
}}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt
diff --git a/.github/workflows/build-and-test-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.1.yml
similarity index 94%
copy from .github/workflows/build-and-test-3.1.yml
copy to .github/workflows/build-and-test-scheduled-3.1.yml
index e9ae3f8c0d..f0844970dd 100644
--- a/.github/workflows/build-and-test-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -1,6 +1,9 @@
-name: Build and Test For Dubbo 3.1
+name: Build and Test Scheduled On 3.1
-on: [push, pull_request, workflow_dispatch]
+on:
+ schedule:
+ - cron: '0 0 */6 * *'
+ workflow_dispatch:
permissions:
contents: read
@@ -22,6 +25,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 3.1
- name: Check License
uses: apache/skywalking-eyes@main
env:
@@ -33,6 +38,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
+ ref: 3.1
path: dubbo
- uses: actions/setup-java@v1
with:
@@ -41,12 +47,15 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
- name: "Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
- name: "Build Dubbo with Maven"
run: |
cd ./dubbo
@@ -77,15 +86,13 @@ jobs:
echo "dubbo version: $REVISION"
unit-test-prepare:
- name: " Preparation for Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk
}})"
+ name: " Preparation for Unit Test On ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
env:
- DISABLE_FILE_SYSTEM_TEST: true
ZOOKEEPER_VERSION: 3.6.3
steps:
- uses: actions/cache@v2
@@ -140,6 +147,8 @@ jobs:
DISABLE_FILE_SYSTEM_TEST: true
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 3.1
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1
with:
@@ -148,8 +157,9 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Test with Maven with Integration Tests"
timeout-minutes: 70
@@ -177,6 +187,8 @@ jobs:
MAVEN_SUREFIRE_ADD_OPENS: true
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 3.1
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1
with:
@@ -185,8 +197,9 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Test with Maven with Integration Tests"
timeout-minutes: 70
@@ -238,14 +251,18 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Restore Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
- name: "Download test list"
uses: actions/download-artifact@v2
with:
@@ -291,13 +308,14 @@ jobs:
- name: "Merge test result"
run: ./test/scripts/merge-test-results.sh
+
error-code-inspecting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
path: "./dubbo"
-
+
- uses: actions/checkout@v2
with:
repository: 'apache/dubbo-test-tools'
@@ -308,19 +326,18 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 17
-
+
- name: "Compile Dubbo (Linux)"
run: |
cd ${{ github.workspace }}/dubbo
./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
-
- name: "Run Error Code Inspecting"
env:
"dubbo.eci.report-as-error": false
run: |
cd ${{ github.workspace
}}/dubbo-test-tools/dubbo-error-code-inspector
../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C package exec:java -Dmaven.test.skip=true
-Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo
-
+
- name: "Upload error code inspection result"
uses: actions/upload-artifact@v2
with:
diff --git a/.github/workflows/build-and-test-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.2.yml
similarity index 94%
rename from .github/workflows/build-and-test-3.1.yml
rename to .github/workflows/build-and-test-scheduled-3.2.yml
index e9ae3f8c0d..ddeeec63ee 100644
--- a/.github/workflows/build-and-test-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -1,6 +1,9 @@
-name: Build and Test For Dubbo 3.1
+name: Build and Test Scheduled On 3.2
-on: [push, pull_request, workflow_dispatch]
+on:
+ schedule:
+ - cron: '0 0 */6 * *'
+ workflow_dispatch:
permissions:
contents: read
@@ -22,6 +25,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 3.2
- name: Check License
uses: apache/skywalking-eyes@main
env:
@@ -33,6 +38,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
+ ref: 3.2
path: dubbo
- uses: actions/setup-java@v1
with:
@@ -41,12 +47,15 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
- name: "Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
- name: "Build Dubbo with Maven"
run: |
cd ./dubbo
@@ -77,15 +86,13 @@ jobs:
echo "dubbo version: $REVISION"
unit-test-prepare:
- name: " Preparation for Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk
}})"
+ name: " Preparation for Unit Test On ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, windows-2019 ]
- jdk: [ 8, 11, 17, 19 ]
env:
- DISABLE_FILE_SYSTEM_TEST: true
ZOOKEEPER_VERSION: 3.6.3
steps:
- uses: actions/cache@v2
@@ -140,6 +147,8 @@ jobs:
DISABLE_FILE_SYSTEM_TEST: true
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 3.2
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1
with:
@@ -148,8 +157,9 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Test with Maven with Integration Tests"
timeout-minutes: 70
@@ -177,6 +187,8 @@ jobs:
MAVEN_SUREFIRE_ADD_OPENS: true
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 3.2
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v1
with:
@@ -185,8 +197,9 @@ jobs:
name: "Cache local Maven repository"
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Test with Maven with Integration Tests"
timeout-minutes: 70
@@ -238,14 +251,18 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-maven-
- name: "Restore Dubbo cache"
uses: actions/cache@v2
with:
path: ~/.m2/repository/org/apache/dubbo
- key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
- name: "Download test list"
uses: actions/download-artifact@v2
with:
@@ -297,7 +314,7 @@ jobs:
- uses: actions/checkout@v2
with:
path: "./dubbo"
-
+
- uses: actions/checkout@v2
with:
repository: 'apache/dubbo-test-tools'
@@ -308,19 +325,18 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 17
-
+
- name: "Compile Dubbo (Linux)"
run: |
cd ${{ github.workspace }}/dubbo
./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
-
- name: "Run Error Code Inspecting"
env:
"dubbo.eci.report-as-error": false
run: |
cd ${{ github.workspace
}}/dubbo-test-tools/dubbo-error-code-inspector
../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C package exec:java -Dmaven.test.skip=true
-Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo
-
+
- name: "Upload error code inspection result"
uses: actions/upload-artifact@v2
with:
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
index 1dcd22782e..1a5334a8cb 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
@@ -25,6 +25,8 @@ import
org.apache.dubbo.common.metrics.model.sample.GaugeMetricSample;
import org.apache.dubbo.common.metrics.model.sample.MetricSample;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -35,9 +37,9 @@ import java.util.Map;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_GROUP_KEY;
import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_INTERFACE_KEY;
import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_METHOD_KEY;
-import static org.apache.dubbo.common.constants.MetricsConstants.TAG_GROUP_KEY;
import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_VERSION_KEY;
public class DefaultMetricsCollectorTest {
@@ -50,10 +52,10 @@ public class DefaultMetricsCollectorTest {
@BeforeEach
public void setup() {
+ applicationModel = FrameworkModel.defaultModel().newApplication();
ApplicationConfig config = new ApplicationConfig();
config.setName("MockMetrics");
- applicationModel = ApplicationModel.defaultModel();
applicationModel.getApplicationConfigManager().setApplication(config);
interfaceName = "org.apache.dubbo.MockInterface";
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 25b4d0190d..bb3804231a 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -92,7 +92,7 @@
<spring_version>5.2.20.RELEASE</spring_version>
<javassist_version>3.28.0-GA</javassist_version>
<netty_version>3.2.5.Final</netty_version>
- <netty4_version>4.1.56.Final</netty4_version>
+ <netty4_version>4.1.72.Final</netty4_version>
<mina_version>2.1.5</mina_version>
<grizzly_version>2.4.4</grizzly_version>
<httpclient_version>4.5.13</httpclient_version>
@@ -878,4 +878,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
