You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/10/08 10:13:28 UTC
[shardingsphere] branch master updated: Refactor workflow (#21394)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e45c0a9205d Refactor workflow (#21394)
e45c0a9205d is described below
commit e45c0a9205df1e4a363e6709ac5678e39b75fd42
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Oct 8 18:13:20 2022 +0800
Refactor workflow (#21394)
---
.github/workflows/ci.yml | 3 +-
.github/workflows/docker-release.yml | 2 +-
.github/workflows/issue-automation.yml | 2 +-
.github/workflows/it-scaling.yml | 2 +-
.github/workflows/it-transaction.yml | 2 +-
.github/workflows/it.yml | 59 +++++++++-------------
...daily-nightlies-rsync.yml => nightly-build.yml} | 13 ++---
.github/workflows/{daily-ci.yml => nightly-ci.yml} | 14 +++--
...graalvm-image.yml => nightly-graalvm-image.yml} | 7 ++-
...tor-it.yml => nightly-it-example-generator.yml} | 27 ++++++----
10 files changed, 59 insertions(+), 72 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e46affaa78d..9b7d44eafa6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,8 +93,7 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Set up JDK 8
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 6242b0a5dea..124ba1baa14 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -49,7 +49,7 @@ jobs:
distribution: 'temurin'
java-version: 8
- name: Set environment
- run: export MAVEN_OPTS=' -Dmaven.javadoc.skip=true -Drat.skip=true -Djacoco.skip=true $MAVEN_OPTS'
+ run: export MAVEN_OPTS=' -Dmaven.javadoc.skip=true -Djacoco.skip=true $MAVEN_OPTS'
- name: Build docker image
run: |
./mvnw -B -Prelease,docker -DskipTests clean install
diff --git a/.github/workflows/issue-automation.yml b/.github/workflows/issue-automation.yml
index d9aac1104fc..3ce35c4ffee 100644
--- a/.github/workflows/issue-automation.yml
+++ b/.github/workflows/issue-automation.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: ISSUE Standardized Process
+name: Issue Automation
on:
schedule:
diff --git a/.github/workflows/it-scaling.yml b/.github/workflows/it-scaling.yml
index d7e3ceb5a70..07a11c44f7e 100644
--- a/.github/workflows/it-scaling.yml
+++ b/.github/workflows/it-scaling.yml
@@ -66,7 +66,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Djacoco.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Djacoco.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
jobs:
scaling-it-test:
diff --git a/.github/workflows/it-transaction.yml b/.github/workflows/it-transaction.yml
index 0a4b9723a40..0637b0ff754 100644
--- a/.github/workflows/it-transaction.yml
+++ b/.github/workflows/it-transaction.yml
@@ -56,7 +56,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Djacoco.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Djacoco.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
jobs:
transaction-it-test:
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index 9e23732e2fe..0d232da67c2 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Integration Test
+name: IT
on:
push:
@@ -24,17 +24,17 @@ on:
- '.github/workflows/it.yml'
- '**/pom.xml'
- '**/src/main/**'
- - '!examples/**'
- - '!distribution/**'
- 'distribution/proxy/**'
- - '!distribution/proxy/src/main/release-docs/**'
- - '!kernel/data-pipeline/**'
- - '!test/**'
- 'test/pom.xml'
- 'test/integration-test/fixture/**'
- 'test/integration-test/env/**'
- 'test/integration-test/test-suite/**'
- 'test/integration-agent-test/**'
+ - '!examples/**'
+ - '!distribution/**'
+ - '!distribution/proxy/src/main/release-docs/**'
+ - '!kernel/data-pipeline/**'
+ - '!test/**'
- '!*.md'
pull_request:
branches: [ master ]
@@ -42,17 +42,17 @@ on:
- '.github/workflows/it.yml'
- '**/pom.xml'
- '**/src/main/**'
- - '!examples/**'
- - '!distribution/**'
- 'distribution/proxy/**'
- - '!distribution/proxy/src/main/release-docs/**'
- - '!kernel/data-pipeline/**'
- - '!test/**'
- 'test/pom.xml'
- 'test/integration-test/fixture/**'
- 'test/integration-test/env/**'
- 'test/integration-test/test-suite/**'
- 'test/integration-agent-test/**'
+ - '!examples/**'
+ - '!distribution/**'
+ - '!distribution/proxy/src/main/release-docs/**'
+ - '!kernel/data-pipeline/**'
+ - '!test/**'
- '!*.md'
concurrency:
@@ -60,26 +60,24 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Drat.skip=true -Djacoco.skip=true -Dspotless.apply.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dspotless.apply.skip=true
jobs:
build-it-image:
- name: build-it-image
+ name: Build IT image
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- - name: Cache Maven Repos
- uses: actions/cache@v2
+ - uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Set up JDK 8
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
@@ -89,8 +87,7 @@ jobs:
run: ./mvnw -B install -pl test/integration-test/test-suite -Dspotless.apply.skip=true
- name: Save IT image
run: docker save -o /tmp/shardingsphere-proxy-test.tar apache/shardingsphere-proxy-test:latest
- - name: Upload IT image
- uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v3
with:
name: it-image
path: /tmp/shardingsphere-proxy-test.tar
@@ -108,13 +105,11 @@ jobs:
scenario: [ empty_rules, rdl_empty_rules ]
steps:
- uses: actions/checkout@v2
- - name: Cache Maven Repos
- uses: actions/cache@v2
+ - uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
- - name: Set up JDK 8
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
@@ -147,13 +142,11 @@ jobs:
mode: Cluster
steps:
- uses: actions/checkout@v2
- - name: Cache Maven Repos
- uses: actions/cache@v2
+ - uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
- - name: Set up JDK 8
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
@@ -186,13 +179,11 @@ jobs:
mode: Cluster
steps:
- uses: actions/checkout@v2
- - name: Cache Maven Repos
- uses: actions/cache@v2
+ - uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
- - name: Set up JDK 8
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
@@ -215,15 +206,13 @@ jobs:
- uses: actions/checkout@v2
- name: Maven Resolve Ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- - name: Cache Maven Repos
- uses: actions/cache@v2
+ - uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Set up JDK 8
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
diff --git a/.github/workflows/daily-nightlies-rsync.yml b/.github/workflows/nightly-build.yml
similarity index 89%
rename from .github/workflows/daily-nightlies-rsync.yml
rename to .github/workflows/nightly-build.yml
index 652869c0439..22b98d54d4e 100644
--- a/.github/workflows/daily-nightlies-rsync.yml
+++ b/.github/workflows/nightly-build.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Daily - Nightly Builds
+name: Nightly - build
on:
schedule:
@@ -30,24 +30,21 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- - name: Cache Maven Repos
- uses: actions/cache@v2
+ - uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/checkout@v2
- - name: Set up JDK 8
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
- - name: Build Project
+ - name: Build project
run: |
./mvnw -B clean install -Prelease
- - name: rsync
- uses: burnett01/rsync-deployments@5.2
+ - uses: burnett01/rsync-deployments@5.2
with:
switches: -avzr
path: distribution/proxy/target/apache-shardingsphere-*.tar.gz
diff --git a/.github/workflows/daily-ci.yml b/.github/workflows/nightly-ci.yml
similarity index 84%
rename from .github/workflows/daily-ci.yml
rename to .github/workflows/nightly-ci.yml
index 10d9e5ff63e..8d7802bb686 100644
--- a/.github/workflows/daily-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -15,19 +15,19 @@
# limitations under the License.
#
-name: Daily - Continuous Integration
+name: Nightly - CI
on:
schedule:
- cron: '0 18 */1 * *' # once a day. UTC time
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Drat.skip=true -Dcheckstyle.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
jobs:
ci:
if: github.repository == 'apache/shardingsphere'
- name: JDK ${{ matrix.java_version }} - on ${{ matrix.os }}
+ name: CI - JDK ${{ matrix.java_version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 60
strategy:
@@ -40,19 +40,17 @@ jobs:
if: matrix.os == 'windows-latest'
run: git config --global core.longpaths true
- uses: actions/checkout@v3
- - name: Set up JDK ${{ matrix.java_version }}
- uses: actions/setup-java@v2
+ - uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
- - name: Cache Maven Repos
- uses: actions/cache@v2
+ - uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Build with Maven
+ - name: Build prod with Maven
run: ./mvnw -B -ntp clean install
- name: Build examples with Maven
run: ./mvnw -B -f examples/pom.xml clean package
diff --git a/.github/workflows/daily-graalvm-image.yml b/.github/workflows/nightly-graalvm-image.yml
similarity index 86%
rename from .github/workflows/daily-graalvm-image.yml
rename to .github/workflows/nightly-graalvm-image.yml
index 3c9a103967f..88854fe4e00 100644
--- a/.github/workflows/daily-graalvm-image.yml
+++ b/.github/workflows/nightly-graalvm-image.yml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: Daily - GraalVM Native Image CI
+name: Nightly - Build GraalVM Native Image
on:
schedule:
@@ -46,11 +46,10 @@ jobs:
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
cache: 'maven'
- - name: Log in to the Container registry
- uses: docker/login-action@v1.10.0
+ - uses: docker/login-action@v1.10.0
with:
registry: ${{ env.HUB }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push docker image
- run: ./mvnw -am -pl distribution/proxy-native -B -DskipTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Drat.skip=true -Pnative,docker.buildx.push.native -Dproxy.image.repository=${{ env.PROXY }} -Dproxy.image.tag=${{ github.sha }} clean package
+ run: ./mvnw -am -pl distribution/proxy-native -B -DskipTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Pnative,docker.buildx.push.native -Dproxy.image.repository=${{ env.PROXY }} -Dproxy.image.tag=${{ github.sha }} clean package
diff --git a/.github/workflows/daily-example-generator-it.yml b/.github/workflows/nightly-it-example-generator.yml
similarity index 89%
rename from .github/workflows/daily-example-generator-it.yml
rename to .github/workflows/nightly-it-example-generator.yml
index 35f65cf87ac..5672556bda5 100644
--- a/.github/workflows/daily-example-generator-it.yml
+++ b/.github/workflows/nightly-it-example-generator.yml
@@ -15,28 +15,28 @@
# limitations under the License.
#
-name: Daily - Example Generator IT
+name: Nightly - IT Example Generator
on:
schedule:
- cron: '0 19 */1 * *' # once a day. UTC time
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Drat.skip=true -Dcheckstyle.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
jobs:
- shardingsphere-example-generator:
+ example-generator:
if: github.repository == 'apache/shardingsphere'
- name: ${{ matrix.feature }}--${{ matrix.framework }}--${{ matrix.mode }}--${{ matrix.transaction }}
+ name: Example-${{ matrix.feature }}--${{ matrix.framework }}--${{ matrix.mode }}--${{ matrix.transaction }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
- product: [ jdbc ]
- mode: [ standalone ]
- transaction: [ local, xa-atomikos, xa-bitronix, xa-narayana ]
feature: [ sharding, readwrite-splitting, encrypt, shadow ]
framework: [ jdbc, spring-boot-starter-jdbc, spring-boot-starter-jpa, spring-boot-starter-mybatis, spring-namespace-jdbc, spring-namespace-jpa, spring-namespace-mybatis ]
+ mode: [ standalone ]
+ transaction: [ local, xa-atomikos, xa-bitronix, xa-narayana ]
+ product: [ jdbc ]
exclude:
- feature: shadow
framework: spring-boot-starter-jpa
@@ -58,10 +58,15 @@ jobs:
with:
distribution: 'temurin'
java-version: '8'
- cache: 'maven'
+ - uses: actions/cache@v2
+ with:
+ path: ~/.m2/repository
+ key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
- name: Build with Maven
run: ./mvnw -B -ntp clean install -Dmaven.javadoc.skip=true -DskipITs -DskipTests -Dspotless.apply.skip=true
- - name: Prepare Env
+ - name: Prepare environments
run: |
mysql -uroot -h127.0.0.1 -p123456 -e 'CREATE DATABASE IF NOT EXISTS demo_ds_0;CREATE DATABASE IF NOT EXISTS demo_ds_1;CREATE DATABASE IF NOT EXISTS demo_ds_2;'
mysql -uroot -h127.0.0.1 -p123456 -e 'use demo_ds_1;CREATE TABLE IF NOT EXISTS t_order(order_id BIGINT NOT NULL AUTO_INCREMENT, order_type INT(11), user_id INT NOT NULL, address_id BIGINT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));'
@@ -70,7 +75,7 @@ jobs:
mysql -uroot -h127.0.0.1 -p123456 -e 'use demo_ds_2;CREATE TABLE IF NOT EXISTS t_order_item(order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, phone VARCHAR(50), status VARCHAR(50), PRIMARY KEY (order_item_id));'
mysql -uroot -h127.0.0.1 -p123456 -e 'use demo_ds_1;CREATE TABLE IF NOT EXISTS t_address (address_id BIGINT NOT NULL, address_name VARCHAR(100) NOT NULL, PRIMARY KEY (address_id));'
mysql -uroot -h127.0.0.1 -p123456 -e 'use demo_ds_2;CREATE TABLE IF NOT EXISTS t_address (address_id BIGINT NOT NULL, address_name VARCHAR(100) NOT NULL, PRIMARY KEY (address_id));'
- - name: Example generator
+ - name: Generate examples
run: ./mvnw -B test -f examples/shardingsphere-example-generator/pom.xml -Pexample-generator -Dproducts=${{ matrix.product }} -Dmodes=${{ matrix.mode }} -Dtransactions=${{ matrix.transaction }} -Dfeatures=${{ matrix.feature }} -Dframeworks=${{ matrix.framework }}
- - name: Example Test
+ - name: Test examples
run : ./mvnw -B test -f examples/shardingsphere-example-generator/target/generated-sources/shardingsphere-jdbc-sample/${{ matrix.feature }}--${{ matrix.framework }}--${{ matrix.mode }}--${{ matrix.transaction }}/pom.xml -Pexample-generator -Dexec.cleanupDaemonThreads=false