This is an automated email from the ASF dual-hosted git repository.
songxiaosheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 207b1f3a Update readme (#478)
207b1f3a is described below
commit 207b1f3adc6292b4bb8fa0ba985642590786da00
Author: aofall <[email protected]>
AuthorDate: Tue Aug 20 19:58:19 2024 +0800
Update readme (#478)
* chore: Update Readme and Security, Upload codecov result
* chore: Upload codecov result
---
.codecov.yml | 4 +
.github/workflows/build-and-test-pr.yml | 4 +-
...ed-3.1.yml => build-and-test-scheduled-3.0.yml} | 12 +-
.github/workflows/build-and-test-scheduled-3.1.yml | 8 +-
.github/workflows/build-and-test-scheduled-3.2.yml | 8 +-
...ed-3.2.yml => build-and-test-scheduled-3.3.yml} | 10 +-
.../workflows/build-and-test-scheduled-main.yml | 4 +-
.github/workflows/conformance.yml | 246 ++++++++++-----------
README.md | 6 +-
README_CN.md | 6 +-
SECURITY.md | 10 +-
11 files changed, 162 insertions(+), 156 deletions(-)
diff --git a/.codecov.yml b/.codecov.yml
index 8a9fd1bb..8471f69f 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -13,6 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+codecov:
+ require_ci_to_pass: false
+ notify:
+ wait_for_ci: false
coverage:
status:
# pull-requests only
diff --git a/.github/workflows/build-and-test-pr.yml
b/.github/workflows/build-and-test-pr.yml
index 8dcdee3a..c9a96e59 100644
--- a/.github/workflows/build-and-test-pr.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@ -137,8 +137,6 @@ jobs:
with:
name: "checkstyle-file"
path: ${{ github.workspace }}/checkstyle.zip
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v4
- name: "Calculate Dubbo-SPI-Extensions Version"
id: dubbo-spi-extensions-version
run: |
@@ -295,6 +293,8 @@ jobs:
with:
name: coverage-result-${{ matrix.os }}-${{ matrix.jdk }}
path: "**/target/site/**/jacoco.xml"
+ - name: "Upload coverage to Codecov"
+ uses: codecov/codecov-action@v4
# error-code-inspecting:
# needs: [check-license, build-tools]
diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.0.yml
similarity index 99%
copy from .github/workflows/build-and-test-scheduled-3.1.yml
copy to .github/workflows/build-and-test-scheduled-3.0.yml
index ec264fd4..d56f69c7 100644
--- a/.github/workflows/build-and-test-scheduled-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.0.yml
@@ -1,4 +1,4 @@
-name: Build and Test Scheduled On 3.1
+name: Build and Test Scheduled On 3.0
on:
schedule:
@@ -29,7 +29,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
- ref: '3.1.0'
+ ref: '3.0.0'
- name: Check License
uses: apache/[email protected]
env:
@@ -73,7 +73,7 @@ jobs:
name: build tools
with:
repository: 'apache/dubbo'
- ref: '3.1'
+ ref: '3.0'
path: dubbo
- name: "Set up JDK 21"
uses: actions/setup-java@v4
@@ -103,7 +103,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
- ref: "3.1.0"
+ ref: "3.0"
path: dubbo-spi-extensions
- uses: actions/setup-java@v4
with:
@@ -143,8 +143,6 @@ jobs:
with:
name: "checkstyle-file"
path: ${{ github.workspace }}/checkstyle.zip
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v4
- name: "Calculate Dubbo-SPI-Extensions Version"
id: dubbo-spi-extensions-version
run: |
@@ -301,6 +299,8 @@ jobs:
with:
name: coverage-result-${{ matrix.os }}-${{ matrix.jdk }}
path: "**/target/site/**/jacoco.xml"
+ - name: "Upload coverage to Codecov"
+ uses: codecov/codecov-action@v4
# error-code-inspecting:
# needs: [check-license, build-tools]
diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.1.yml
index ec264fd4..98400f95 100644
--- a/.github/workflows/build-and-test-scheduled-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -29,7 +29,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
- ref: '3.1.0'
+ ref: '3.1'
- name: Check License
uses: apache/[email protected]
env:
@@ -103,7 +103,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
- ref: "3.1.0"
+ ref: "3.1"
path: dubbo-spi-extensions
- uses: actions/setup-java@v4
with:
@@ -143,8 +143,6 @@ jobs:
with:
name: "checkstyle-file"
path: ${{ github.workspace }}/checkstyle.zip
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v4
- name: "Calculate Dubbo-SPI-Extensions Version"
id: dubbo-spi-extensions-version
run: |
@@ -301,6 +299,8 @@ jobs:
with:
name: coverage-result-${{ matrix.os }}-${{ matrix.jdk }}
path: "**/target/site/**/jacoco.xml"
+ - name: "Upload coverage to Codecov"
+ uses: codecov/codecov-action@v4
# error-code-inspecting:
# needs: [check-license, build-tools]
diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml
b/.github/workflows/build-and-test-scheduled-3.2.yml
index 3879c8b0..66dc2f7a 100644
--- a/.github/workflows/build-and-test-scheduled-3.2.yml
+++ b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -29,7 +29,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
- ref: '3.2.0'
+ ref: '3.2'
- name: Check License
uses: apache/[email protected]
env:
@@ -103,7 +103,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
- ref: "3.2.0"
+ ref: "3.2"
path: dubbo-spi-extensions
- uses: actions/setup-java@v4
with:
@@ -143,8 +143,6 @@ jobs:
with:
name: "checkstyle-file"
path: ${{ github.workspace }}/checkstyle.zip
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v4
- name: "Calculate Dubbo-SPI-Extensions Version"
id: dubbo-spi-extensions-version
run: |
@@ -301,6 +299,8 @@ jobs:
with:
name: coverage-result-${{ matrix.os }}-${{ matrix.jdk }}
path: "**/target/site/**/jacoco.xml"
+ - name: "Upload coverage to Codecov"
+ uses: codecov/codecov-action@v4
# error-code-inspecting:
# needs: [check-license, build-tools]
diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml
b/.github/workflows/build-and-test-scheduled-3.3.yml
similarity index 99%
copy from .github/workflows/build-and-test-scheduled-3.2.yml
copy to .github/workflows/build-and-test-scheduled-3.3.yml
index 3879c8b0..e2443647 100644
--- a/.github/workflows/build-and-test-scheduled-3.2.yml
+++ b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -1,4 +1,4 @@
-name: Build and Test Scheduled On 3.2
+name: Build and Test Scheduled On 3.3
on:
schedule:
@@ -29,7 +29,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
- ref: '3.2.0'
+ ref: '3.3'
- name: Check License
uses: apache/[email protected]
env:
@@ -103,7 +103,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
- ref: "3.2.0"
+ ref: "3.3"
path: dubbo-spi-extensions
- uses: actions/setup-java@v4
with:
@@ -143,8 +143,6 @@ jobs:
with:
name: "checkstyle-file"
path: ${{ github.workspace }}/checkstyle.zip
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v4
- name: "Calculate Dubbo-SPI-Extensions Version"
id: dubbo-spi-extensions-version
run: |
@@ -301,6 +299,8 @@ jobs:
with:
name: coverage-result-${{ matrix.os }}-${{ matrix.jdk }}
path: "**/target/site/**/jacoco.xml"
+ - name: "Upload coverage to Codecov"
+ uses: codecov/codecov-action@v4
# error-code-inspecting:
# needs: [check-license, build-tools]
diff --git a/.github/workflows/build-and-test-scheduled-main.yml
b/.github/workflows/build-and-test-scheduled-main.yml
index 47ad3ca1..61184433 100644
--- a/.github/workflows/build-and-test-scheduled-main.yml
+++ b/.github/workflows/build-and-test-scheduled-main.yml
@@ -143,8 +143,6 @@ jobs:
with:
name: "checkstyle-file"
path: ${{ github.workspace }}/checkstyle.zip
- - name: "Upload coverage to Codecov"
- uses: codecov/codecov-action@v4
- name: "Calculate Dubbo-SPI-Extensions Version"
id: dubbo-spi-extensions-version
run: |
@@ -286,6 +284,8 @@ jobs:
with:
name: coverage-result-${{ matrix.os }}-${{ matrix.jdk }}
path: "**/target/site/**/jacoco.xml"
+ - name: "Upload coverage to Codecov"
+ uses: codecov/codecov-action@v4
# error-code-inspecting:
# needs: [check-license, build-tools]
diff --git a/.github/workflows/conformance.yml
b/.github/workflows/conformance.yml
index f0f1570b..5f1ea750 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -1,126 +1,126 @@
-name: Extensions Conformance Tests
-
-on:
- pull_request:
- paths:
- - "**"
- - "!**/*.md"
- - "!docs/**"
- push:
- paths:
- - '**'
- - "!**/*.md"
- - "!docs/**"
-
-env:
- FORK_COUNT: 2
- FAIL_FAST: 0
- SHOW_ERROR_DETAIL: 1
- BUILD_OPTS: --batch-mode --no-snapshot-updates --no-transfer-progress
-Dmaven.wagon.http.retryHandler.count=3 clean package
dependency:copy-dependencies -DskipTests
-
-jobs:
- build-extensions:
- name: "Build Extensions"
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- with:
- path: dubbo-spi-extensions
- - uses: actions/checkout@v4
- with:
- repository: 'apache/dubbo'
- ref: '3.0'
- path: dubbo
- - name: Set up JDK 8
- uses: actions/setup-java@v4
- with:
- distribution: 'zulu'
- java-version: 8
- - uses: actions/cache@v4
- name: "Cache local Maven repository"
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-extensions-maven${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-extensions-maven
- - name: "Build tools"
- run: |
- cd ./dubbo
- ./mvnw --batch-mode -U -e --no-transfer-progress install -pl
dubbo-build-tools -am -DskipTests=true
- - name: "Build with Maven"
- run: |
- cd ./dubbo-spi-extensions
- ./mvnw --batch-mode -U -e --no-transfer-progress install -am
-DskipTests=true
-
-
- testjob:
- needs: [ prepare_test,build-extensions ]
- name: 'Conformance Test'
- runs-on: ubuntu-latest
- env:
- JAVA_VER: ${{matrix.java}}
- strategy:
- fail-fast: false
- matrix:
- # use the unsafe only run on the jdk8
- java: [ 8 ]
- #testjob id list MUST match 'JOB_COUNT' of 'prepare_test'
- job_id: [ 1,2,3 ]
- steps:
- - uses: actions/checkout@v4
- - name: Set up JDK ${{matrix.java}}
- uses: actions/setup-java@v4
- with:
- distribution: 'zulu'
- java-version: ${{matrix.java}}
- - name: Cache local Maven repository
- uses: actions/cache@v4
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-extensions-maven${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-extensions-maven
- - name: Download test list
- uses: actions/download-artifact@v4
- with:
- name: test-list
- path: test/jobs/
- - name: Build test image
- run: |
- cd test && bash ./build-test-image.sh
- - name: Run tests
- run: cd test && bash ./run-tests.sh
- - name: Upload log if test failed
- if: failure()
- uses: actions/upload-artifact@v4
- with:
- name: test-log-${{matrix.java}}-${{matrix.job_id}}
- path: "**/test/scenarios/**/logs/*"
- - name: Upload test result
- if: always()
- uses: actions/upload-artifact@v4
- with:
- name: test-result-${{matrix.job_id}}
- path: test/jobs/*-result*
-
- merge_test:
- needs: [ testjob ]
- name: 'Merge Test Result (Java${{matrix.java}})'
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- java: [ 8 ]
- env:
- JAVA_VER: ${{matrix.java}}
- steps:
- - name: Merge Artifacts
- uses: actions/upload-artifact/merge@v4
- with:
- name: Merge-test-result-Java${{matrix.java}}
- separate-directories: true
- pattern: test-result-*
- delete-merged: true
+#name: Extensions Conformance Tests
+#
+#on:
+# pull_request:
+# paths:
+# - "**"
+# - "!**/*.md"
+# - "!docs/**"
+# push:
+# paths:
+# - '**'
+# - "!**/*.md"
+# - "!docs/**"
+#
+#env:
+# FORK_COUNT: 2
+# FAIL_FAST: 0
+# SHOW_ERROR_DETAIL: 1
+# BUILD_OPTS: --batch-mode --no-snapshot-updates --no-transfer-progress
-Dmaven.wagon.http.retryHandler.count=3 clean package
dependency:copy-dependencies -DskipTests
+#
+#jobs:
+# build-extensions:
+# name: "Build Extensions"
+# runs-on: ubuntu-latest
+# steps:
+# - uses: actions/checkout@v4
+# with:
+# path: dubbo-spi-extensions
+# - uses: actions/checkout@v4
+# with:
+# repository: 'apache/dubbo'
+# ref: '3.0'
+# path: dubbo
+# - name: Set up JDK 8
+# uses: actions/setup-java@v4
+# with:
+# distribution: 'zulu'
+# java-version: 8
+# - uses: actions/cache@v4
+# name: "Cache local Maven repository"
+# with:
+# path: ~/.m2/repository
+# key: ${{ runner.os }}-extensions-maven${{ hashFiles('**/pom.xml') }}
+# restore-keys: |
+# ${{ runner.os }}-extensions-maven
+# - name: "Build tools"
+# run: |
+# cd ./dubbo
+# ./mvnw --batch-mode -U -e --no-transfer-progress install -pl
dubbo-build-tools -am -DskipTests=true
+# - name: "Build with Maven"
+# run: |
+# cd ./dubbo-spi-extensions
+# ./mvnw --batch-mode -U -e --no-transfer-progress install -am
-DskipTests=true
+#
+#
+# testjob:
+# needs: [ build-extensions ]
+# name: 'Conformance Test'
+# runs-on: ubuntu-latest
+# env:
+# JAVA_VER: ${{matrix.java}}
+# strategy:
+# fail-fast: false
+# matrix:
+# # use the unsafe only run on the jdk8
+# java: [ 8 ]
+# #testjob id list MUST match 'JOB_COUNT' of 'prepare_test'
+# job_id: [ 1,2,3 ]
+# steps:
+# - uses: actions/checkout@v4
+# - name: Set up JDK ${{matrix.java}}
+# uses: actions/setup-java@v4
+# with:
+# distribution: 'zulu'
+# java-version: ${{matrix.java}}
+# - name: Cache local Maven repository
+# uses: actions/cache@v4
+# with:
+# path: ~/.m2/repository
+# key: ${{ runner.os }}-extensions-maven${{ hashFiles('**/pom.xml') }}
+# restore-keys: |
+# ${{ runner.os }}-extensions-maven
+# - name: Download test list
+# uses: actions/download-artifact@v4
+# with:
+# name: test-list
+# path: test/jobs/
+# - name: Build test image
+# run: |
+# cd test && bash ./build-test-image.sh
+# - name: Run tests
+# run: cd test && bash ./run-tests.sh
+# - name: Upload log if test failed
+# if: failure()
+# uses: actions/upload-artifact@v4
+# with:
+# name: test-log-${{matrix.java}}-${{matrix.job_id}}
+# path: "**/test/scenarios/**/logs/*"
+# - name: Upload test result
+# if: always()
+# uses: actions/upload-artifact@v4
+# with:
+# name: test-result-${{matrix.job_id}}
+# path: test/jobs/*-result*
+#
+# merge_test:
+# needs: [ testjob ]
+# name: 'Merge Test Result (Java${{matrix.java}})'
+# runs-on: ubuntu-latest
+# strategy:
+# fail-fast: false
+# matrix:
+# java: [ 8 ]
+# env:
+# JAVA_VER: ${{matrix.java}}
+# steps:
+# - name: Merge Artifacts
+# uses: actions/upload-artifact/merge@v4
+# with:
+# name: Merge-test-result-Java${{matrix.java}}
+# separate-directories: true
+# pattern: test-result-*
+# delete-merged: true
# test_result:
# needs: [ testjob ]
diff --git a/README.md b/README.md
index 041a94e6..7e0462ec 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
# dubbo-spi-extensions
-[](https://travis-ci.org/apache/dubbo-spi-extensions)
+[](https://github.com/apache/dubbo-spi-extensions/actions/workflows/build-and-test-pr.yml)
[](https://codecov.io/gh/apache/dubbo-spi-extensions)
-[](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions)
-[]
+[](https://search.maven.org/search?q=g:org.apache.dubbo.extensions)
+[](https://www.apache.org/licenses/LICENSE-2.0)
[中文](./README_CN.md)
diff --git a/README_CN.md b/README_CN.md
index 20fd4e23..77b111ba 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,8 +1,8 @@
# dubbo-spi-extensions
-[](https://travis-ci.org/apache/dubbo-spi-extensions)
+[](https://github.com/apache/dubbo-spi-extensions/actions/workflows/build-and-test-pr.yml)
[](https://codecov.io/gh/apache/dubbo-spi-extensions)
-[](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions)
-[]
+[](https://search.maven.org/search?q=g:org.apache.dubbo.extensions)
+[](https://www.apache.org/licenses/LICENSE-2.0)
[English](./README.md)
diff --git a/SECURITY.md b/SECURITY.md
index 4929cf45..900a8580 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -5,10 +5,12 @@
Below is a table that shows versions that accept security fix.
| Version | Supported |
-| ------- | ------------------ |
-| 2.7.x | :white_check_mark: |
-| 2.6.x | :white_check_mark: |
-| 2.5.x | :x: |
+|---------|--------------------|
+| 3.3.x | :white_check_mark: |
+| 3.2.x | :white_check_mark: |
+| 3.1.x | :white_check_mark: |
+| 3.0.x | :white_check_mark: |
+| 1.x | :x: |
## Reporting a Vulnerability
