You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/12/06 09:25:01 UTC
[shardingsphere] branch master updated: Replace some duplicated variables with environment variables (#22697)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 703129b4857 Replace some duplicated variables with environment variables (#22697)
703129b4857 is described below
commit 703129b4857281d8433a6c32e48aa9a1be8b6b04
Author: 孙念君 Nianjun Sun <su...@apache.org>
AuthorDate: Tue Dec 6 17:24:53 2022 +0800
Replace some duplicated variables with environment variables (#22697)
* Refactor : replace some duplicated variables with environment variables (#22695)
* Refactor : refactor the expression
* Revise : revert the change for job level variables (#22695)
* Refactor : refacor the condition usage
* Test : try the new condition clause
* Test : try the new condition clause
* Refactor : revise the condition variables for nightly builds (#22695)
* Rename : rename the nightly files (#22695)
---
.github/workflows/check.yml | 7 +++--
.github/workflows/ci.yml | 12 ++++----
.github/workflows/docker-release.yml | 5 +--
.../{it-discovery.yml => e2e-discovery.yml} | 13 ++++----
.../{it-pipeline.yml => e2e-pipeline.yml} | 19 ++++++------
...showprocesslist.yml => e2e-showprocesslist.yml} | 13 ++++----
.../{it-transaction.yml => e2e-transaction.yml} | 13 ++++----
.github/workflows/{it.yml => e2e.yml} | 34 ++++++++++----------
.github/workflows/nightly-build.yml | 14 +++++----
.github/workflows/nightly-ci.yml | 8 +++--
...rator.yml => nightly-e2e-example-generator.yml} | 11 ++++---
.../workflows/{nightly-it.yml => nightly-e2e.yml} | 36 +++++++++++++---------
.github/workflows/nightly-sql-parser.yml | 12 +++++---
13 files changed, 111 insertions(+), 86 deletions(-)
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 071ce77c109..3835e2753d8 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -44,6 +44,9 @@ concurrency:
group: check-${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
+env:
+ REPOSITORY_NAME: shardingsphere
+
jobs:
check-checkstyle:
name: Check - checkstyle
@@ -54,9 +57,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Run checkstyle
run: ./mvnw checkstyle:check -T1C
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 043ea5a9c8d..c61f884ab4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,16 +52,16 @@ concurrency:
env:
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 -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true -Djacoco.skip=true -Drat.skip=true
+ REPOSITORY_NAME: shardingsphere
jobs:
ci:
name: CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
java-version: [ 8, 19 ]
- os: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
@@ -71,9 +71,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build prod with Maven
@@ -91,9 +91,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index bffe2fd0b81..624b1a85833 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -25,6 +25,7 @@ on:
env:
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=30 -DskipTests
+ REPOSITORY_NAME: shardingsphere
jobs:
deploy-docker-images:
@@ -41,9 +42,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
diff --git a/.github/workflows/it-discovery.yml b/.github/workflows/e2e-discovery.yml
similarity index 88%
rename from .github/workflows/it-discovery.yml
rename to .github/workflows/e2e-discovery.yml
index 43e1bef1c55..db58ed2e6f8 100644
--- a/.github/workflows/it-discovery.yml
+++ b/.github/workflows/e2e-discovery.yml
@@ -15,13 +15,13 @@
# limitations under the License.
#
-name: IT - Discovery
+name: E2E - Discovery
on:
push:
branches: [ master, dev ]
paths:
- - '.github/workflows/it-discovery.yml'
+ - '.github/workflows/e2e-discovery.yml'
- 'infra/common/src/main/**'
- 'features/db-discovery/src/main/**'
- 'features/readwrite-splitting/src/main/**'
@@ -36,7 +36,7 @@ on:
pull_request:
branches: [ master ]
paths:
- - '.github/workflows/it-discovery.yml'
+ - '.github/workflows/e2e-discovery.yml'
- 'infra/common/src/main/**'
- 'features/db-discovery/src/main/**'
- 'features/readwrite-splitting/src/main/**'
@@ -56,6 +56,7 @@ concurrency:
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 -Dspotless.apply.skip=true -Djacoco.skip=true -Drat.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
+ REPOSITORY_NAME: shardingsphere
jobs:
discovery-it-test:
@@ -73,10 +74,10 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-it-cache
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
diff --git a/.github/workflows/it-pipeline.yml b/.github/workflows/e2e-pipeline.yml
similarity index 90%
rename from .github/workflows/it-pipeline.yml
rename to .github/workflows/e2e-pipeline.yml
index 8126118484d..117d643fe2a 100644
--- a/.github/workflows/it-pipeline.yml
+++ b/.github/workflows/e2e-pipeline.yml
@@ -15,13 +15,13 @@
# limitations under the License.
#
-name: IT - Pipeline
+name: E2E - Pipeline
on:
push:
branches: [ master, dev ]
paths:
- - '.github/workflows/it-pipeline.yml'
+ - '.github/workflows/e2e-pipeline.yml'
- 'infra/common/src/main/**'
- 'infra/executor/src/main/**'
- 'mode/**/src/main/**'
@@ -41,7 +41,7 @@ on:
pull_request:
branches: [ master ]
paths:
- - '.github/workflows/it-pipeline.yml'
+ - '.github/workflows/e2e-pipeline.yml'
- 'infra/common/src/main/**'
- 'infra/executor/src/main/**'
- 'mode/**/src/main/**'
@@ -68,6 +68,7 @@ concurrency:
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 -Dspotless.apply.skip=true -Djacoco.skip=true -Drat.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
+ REPOSITORY_NAME: shardingsphere
jobs:
pipeline-it-test:
@@ -85,10 +86,10 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-it-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
@@ -118,10 +119,10 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-it-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
diff --git a/.github/workflows/it-showprocesslist.yml b/.github/workflows/e2e-showprocesslist.yml
similarity index 88%
rename from .github/workflows/it-showprocesslist.yml
rename to .github/workflows/e2e-showprocesslist.yml
index a4a485fadb5..609844f6ffa 100644
--- a/.github/workflows/it-showprocesslist.yml
+++ b/.github/workflows/e2e-showprocesslist.yml
@@ -15,13 +15,13 @@
# limitations under the License.
#
-name: IT - ShowProcesslist
+name: E2E - ShowProcesslist
on:
push:
branches: [ master, dev ]
paths:
- - '.github/workflows/it-showprocesslist.yml'
+ - '.github/workflows/e2e-showprocesslist.yml'
- 'infra/common/src/main/**'
- 'mode/**/src/main/**'
- 'proxy/**/src/main/**'
@@ -35,7 +35,7 @@ on:
pull_request:
branches: [ master ]
paths:
- - '.github/workflows/it-showprocesslist.yml'
+ - '.github/workflows/e2e-showprocesslist.yml'
- 'infra/common/src/main/**'
- 'mode/**/src/main/**'
- 'proxy/**/src/main/**'
@@ -54,6 +54,7 @@ concurrency:
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 -Dspotless.apply.skip=true -Djacoco.skip=true -Drat.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
+ REPOSITORY_NAME: shardingsphere
jobs:
showprocesslist-it-test:
@@ -71,10 +72,10 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-it-cache
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
diff --git a/.github/workflows/it-transaction.yml b/.github/workflows/e2e-transaction.yml
similarity index 91%
rename from .github/workflows/it-transaction.yml
rename to .github/workflows/e2e-transaction.yml
index 6b39e57b2ab..1e933c3a209 100644
--- a/.github/workflows/it-transaction.yml
+++ b/.github/workflows/e2e-transaction.yml
@@ -15,13 +15,13 @@
# limitations under the License.
#
-name: IT - Transaction
+name: E2E - Transaction
on:
push:
branches: [ master, dev ]
paths:
- - '.github/workflows/it-transaction.yml'
+ - '.github/workflows/e2e-transaction.yml'
- 'infra/common/src/main/**'
- 'mode/**/src/main/**'
- 'proxy/**/src/main/**'
@@ -37,7 +37,7 @@ on:
pull_request:
branches: [ master ]
paths:
- - '.github/workflows/it-transaction.yml'
+ - '.github/workflows/e2e-transaction.yml'
- 'infra/common/src/main/**'
- 'mode/**/src/main/**'
- 'proxy/**/src/main/**'
@@ -58,6 +58,7 @@ concurrency:
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 -Dspotless.apply.skip=true -Djacoco.skip=true -Drat.skip=true -Dfailsafe.skipAfterFailureCount=1 -Dio.netty.leakDetectionLevel=advanced
+ REPOSITORY_NAME: shardingsphere
jobs:
transaction-it-test:
@@ -74,10 +75,10 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-it-cache
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
diff --git a/.github/workflows/it.yml b/.github/workflows/e2e.yml
similarity index 86%
rename from .github/workflows/it.yml
rename to .github/workflows/e2e.yml
index 41481b11ebd..ae4b0b82c06 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/e2e.yml
@@ -15,13 +15,13 @@
# limitations under the License.
#
-name: IT
+name: E2E
on:
push:
branches: [ master, dev ]
paths:
- - '.github/workflows/it.yml'
+ - '.github/workflows/e2e.yml'
- '**/pom.xml'
- '**/src/main/**'
- 'distribution/proxy/**'
@@ -36,7 +36,7 @@ on:
pull_request:
branches: [ master ]
paths:
- - '.github/workflows/it.yml'
+ - '.github/workflows/e2e.yml'
- '**/pom.xml'
- '**/src/main/**'
- 'distribution/proxy/**'
@@ -56,6 +56,8 @@ concurrency:
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 -Djacoco.skip=true -Dspotless.apply.skip=true -Drat.skip=true
+ REPOSITORY: apache/shardingsphere
+ REPOSITORY_NAME: shardingsphere
jobs:
build-it-image:
@@ -71,10 +73,10 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-it-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build IT image
@@ -82,11 +84,11 @@ jobs:
- name: Verify Suite CI Run
run: ./mvnw -B install -pl test/e2e/suite -Dspotless.apply.skip=true
- name: Save IT image
- run: docker save -o /tmp/shardingsphere-proxy-test.tar apache/shardingsphere-proxy-test:latest
+ run: docker save -o /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar ${{ env.REPOSITORY }}-proxy-test:latest
- uses: actions/upload-artifact@v3
with:
name: it-image
- path: /tmp/shardingsphere-proxy-test.tar
+ path: /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
retention-days: 1
it-empty-rule:
@@ -107,7 +109,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -120,7 +122,7 @@ jobs:
path: /tmp/
- name: Load IT image
if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/shardingsphere-proxy-test.tar
+ run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
- name: Run Integration Test
run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml -Dspotless.apply.skip=true -Dit.run.modes=Cluster -Dit.scenarios=${{ matrix.scenario }} -Dit.cluster.adapters=${{ matrix.adapter }} -Dit.cluster.databases=${{ matrix.database }} -Dit.cluster.env.type=DOCKER
@@ -143,7 +145,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -156,7 +158,7 @@ jobs:
path: /tmp/
- name: Load IT image
if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/shardingsphere-proxy-test.tar
+ run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
- name: Run Integration Test
run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml -Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER -Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} -Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ matrix.scenario }}
@@ -179,7 +181,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -192,7 +194,7 @@ jobs:
path: /tmp/
- name: Load IT image
if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/shardingsphere-proxy-test.tar
+ run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
- name: Run Integration Test
run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml -Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER -Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} -Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ matrix.scenario }}
@@ -208,9 +210,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build Project
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index ab0a12959e3..d5497a4de1b 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -28,6 +28,8 @@ on:
env:
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 -Dmaven.javadoc.skip=true -Djacoco.skip=true -DskipITs -DskipTests -Dspotless.apply.skip=true -Drat.skip=true
+ REPOSITORY: apache/shardingsphere
+ REPOSITORY_NAME: shardingsphere
HUB: ghcr.io/apache/shardingsphere
PROXY: ghcr.io/apache/shardingsphere-proxy
PROXY_NATIVE: ghcr.io/apache/shardingsphere-proxy-native
@@ -41,10 +43,10 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
@@ -83,10 +85,10 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Log in to the Container registry
uses: docker/login-action@v2
with:
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
index 27417137df7..2d26046d6b4 100644
--- a/.github/workflows/nightly-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -24,6 +24,7 @@ on:
env:
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 -Drat.skip=true
+ REPOSITORY_NAME: shardingsphere
jobs:
ci:
@@ -32,6 +33,7 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 90
strategy:
+ max-parallel: 1
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
@@ -48,10 +50,10 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Build prod with Maven
run: ./mvnw -T1C -B -ntp clean install
- name: Build examples with Maven
diff --git a/.github/workflows/nightly-it-example-generator.yml b/.github/workflows/nightly-e2e-example-generator.yml
similarity index 91%
rename from .github/workflows/nightly-it-example-generator.yml
rename to .github/workflows/nightly-e2e-example-generator.yml
index 67bd7cd4a34..ad8f6bb76ad 100644
--- a/.github/workflows/nightly-it-example-generator.yml
+++ b/.github/workflows/nightly-e2e-example-generator.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Nightly - IT Example Generator
+name: Nightly - E2E Example Generator
on:
schedule:
@@ -24,6 +24,7 @@ on:
env:
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 -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true -Drat.skip=true
+ REPOSITORY_NAME: shardingsphere
jobs:
build-cache:
@@ -40,9 +41,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Build with Maven
run: ./mvnw -B -T1C -ntp clean install -DskipITs -DskipTests
generate-and-test-examples:
@@ -81,9 +82,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Prepare environments
diff --git a/.github/workflows/nightly-it.yml b/.github/workflows/nightly-e2e.yml
similarity index 84%
rename from .github/workflows/nightly-it.yml
rename to .github/workflows/nightly-e2e.yml
index ebd9690d838..aa2084d5a49 100644
--- a/.github/workflows/nightly-it.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Nightly - IT
+name: Nightly - E2E
on:
schedule:
@@ -28,6 +28,8 @@ concurrency:
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 -Djacoco.skip=true -Dspotless.apply.skip=true -Drat.skip=true
+ REPOSITORY: apache/shardingsphere
+ REPOSITORY_NAME: shardingsphere
jobs:
build-it-image:
@@ -44,10 +46,10 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-it-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build IT image
@@ -55,11 +57,11 @@ jobs:
- name: Verify Suite CI Run
run: ./mvnw -B install -pl test/e2e/suite -Dspotless.apply.skip=true
- name: Save IT image
- run: docker save -o /tmp/shardingsphere-proxy-test.tar apache/shardingsphere-proxy-test:latest
+ run: docker save -o /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar ${{ env.REPOSITORY }}-proxy-test:latest
- uses: actions/upload-artifact@v3
with:
name: it-image
- path: /tmp/shardingsphere-proxy-test.tar
+ path: /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
retention-days: 1
it-empty-rule:
@@ -68,6 +70,8 @@ jobs:
timeout-minutes: 10
needs: build-it-image
strategy:
+ max-parallel: 2
+ fail-fast: false
matrix:
adapter: [ proxy, jdbc ]
database: [ MySQL, PostgreSQL, openGauss ]
@@ -80,7 +84,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -93,7 +97,7 @@ jobs:
path: /tmp/
- name: Load IT image
if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/shardingsphere-proxy-test.tar
+ run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
- name: Run Integration Test
run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml -Dspotless.apply.skip=true -Dit.run.modes=Cluster -Dit.scenarios=${{ matrix.scenario }} -Dit.cluster.adapters=${{ matrix.adapter }} -Dit.cluster.databases=${{ matrix.database }} -Dit.cluster.env.type=DOCKER
@@ -103,6 +107,8 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
+ max-parallel: 2
+ fail-fast: false
matrix:
adapter: [ proxy, jdbc ]
mode: [ standalone, Cluster ]
@@ -116,7 +122,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -129,7 +135,7 @@ jobs:
path: /tmp/
- name: Load IT image
if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/shardingsphere-proxy-test.tar
+ run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
- name: Run Integration Test
run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml -Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER -Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} -Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ matrix.scenario }}
@@ -139,6 +145,8 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
+ max-parallel: 2
+ fail-fast: false
matrix:
adapter: [ proxy, jdbc ]
mode: [ Standalone, Cluster ]
@@ -152,7 +160,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -165,7 +173,7 @@ jobs:
path: /tmp/
- name: Load IT image
if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/shardingsphere-proxy-test.tar
+ run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
- name: Run Integration Test
run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml -Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER -Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} -Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ matrix.scenario }}
@@ -183,9 +191,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
restore-keys: |
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build Project
diff --git a/.github/workflows/nightly-sql-parser.yml b/.github/workflows/nightly-sql-parser.yml
index 4732c822e41..90d4c33311d 100644
--- a/.github/workflows/nightly-sql-parser.yml
+++ b/.github/workflows/nightly-sql-parser.yml
@@ -24,17 +24,19 @@ on:
env:
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 -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true -Djacoco.skip=true -Drat.skip=true
+ RUNS_ON: ubuntu-latest
+ REPOSITORY: apache/shardingsphere
+ REPOSITORY_NAME: shardingsphere
jobs:
database-parse:
if: github.repository == 'apache/shardingsphere'
name: CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }} for ${{ matrix.database }}
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
timeout-minutes: 90
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-latest ]
java-version: [ 8 ]
database: [ mysql, postgresql ]
steps:
@@ -46,10 +48,10 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: shardingsphere-maven-third-party-cache-${{ github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-${{ github.sha }}
restore-keys: |
- shardingsphere-maven-third-party-cache-
- shardingsphere-maven-third-party-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Build prod with Maven
run: ./mvnw -T1C -B -ntp clean install
- name: Run SQL parser