Merge branch 'master' of github.com:apache/shardingsphere into graal-…

…native-image
apache · Oct 9, 2022 · 0162e91 · 0162e91
2 parents c4599db + b2d38cc
commit 0162e91
Show file tree

Hide file tree

Showing 229 changed files with 3,581 additions and 1,737 deletions.
diff --git a/...orkflows/checkstyle-and-license-check.yml → .github/workflows/check.yml b/...orkflows/checkstyle-and-license-check.yml → .github/workflows/check.yml
@@ -15,10 +15,7 @@
 # limitations under the License.
 #
 
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Check - Checkstyle and License Check
+name: Check
 
 on:
   push:
@@ -41,30 +38,29 @@ on:
       - '!*.md'
 
 concurrency:
-  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  group: check-${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  checkstyle-check:
+  check-checkstyle:
+    name: Check - checkstyle
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
-      - 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: Run Checkstyle
+      - name: Run checkstyle
         run: ./mvnw checkstyle:check -T1C
 
   check-license:
-    name: license-check
+    name: Check - license
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Check License Header
-        uses: apache/[email protected]
+      - uses: actions/checkout@v3
+      - uses: apache/[email protected]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,10 +15,7 @@
 # limitations under the License.
 #
 
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Continuous Integration
+name: CI
 
 on:
   push:
@@ -46,49 +43,47 @@ on:
       - 'test/integration-driver-test/**'
       - '!*.md'
   repository_dispatch:
-    types: [rerun-ci]
+    types: [ci-completed]
 
 concurrency:
   group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   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 -Dcheckstyle.skip=true -Drat.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 -Dcheckstyle.skip=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true -Djacoco.skip=true
 
 jobs:
-  linux:
-    name: JDK ${{ matrix.java_version }} - on ${{ matrix.os }}
+  ci:
+    name: CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     strategy:
       matrix:
-        java_version: [ 8, 19 ]
+        java-version: [ 8, 19 ]
         os: [ ubuntu-latest ]
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: ${{ matrix.java_version }}
-      - name: Maven resolve ranges
-        run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
-      - name: Cache Maven Repos
-        uses: actions/cache@v2
+          java-version: ${{ matrix.java-version }}
+      - 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 -Djacoco.skip=true 
+      - name: Maven resolve ranges
+        run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
+      - name: Build prod with Maven
+        run: ./mvnw -T1C -B -ntp clean install
       - name: Build examples with Maven
-        run: ./mvnw -B -f examples/pom.xml clean package -DskipTests
+        run: ./mvnw -T1C -B -f examples/pom.xml clean package -DskipTests
 
-  test-coverage-report:
+  test-coverage:
     if: github.repository == 'apache/shardingsphere'
+    name: Test coverage report
     runs-on: ubuntu-latest
-    name: ShardingSphere test coverage report
     steps:
       - uses: actions/checkout@v3
       - name: Cache Maven Repos
@@ -98,12 +93,11 @@ 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@v3
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Test with Maven
-        run: ./mvnw -B -ntp clean install cobertura:cobertura -Dmaven.javadoc.skip=true
+        run: ./mvnw -T1C -B -ntp clean install cobertura:cobertura -Djacoco.skip=false
       - name: Upload to Codecov
         run: bash <(curl -s https://codecov.io/bash)
diff --git a/.github/workflows/docker-per-commit.yaml b/.github/workflows/docker-per-commit.yaml
diff --git a/.github/workflows/docker.yml → .github/workflows/docker-release.yml b/.github/workflows/docker.yml → .github/workflows/docker-release.yml
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-name: Docker - Deploy Docker Image
+name: Docker Release
 
 on:
   release:
@@ -27,47 +27,34 @@ env:
   MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=30 -DskipTests
 
 jobs:
-  deploy-docker-iamge:
+  deploy-docker-images:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v2
-
-      # setup docker
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - 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: Set up JDK 8
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 8
-
-      - name: set environment
-        run: export MAVEN_OPTS=' -Dmaven.javadoc.skip=true -Drat.skip=true -Djacoco.skip=true $MAVEN_OPTS'
-      - name: Build Project
+      - name: Set environment
+        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
           docker image ls --format "{{.ID}} {{.Repository}} {{.Tag}}" | grep apache| sed  's/apache\//${{ secrets.DOCKERHUB_USERNAME }}\//' |tr A-Z a-z |awk '{system("docker tag "$1" "$2":latest;docker tag "$1" "$2":"$3";")}'
-      
-      - name: Push Docker Image
+      - name: Push docker image
         run: |
-          echo Docker Images: 
           echo `docker image ls|grep -i ${{ secrets.DOCKERHUB_USERNAME }}|awk '{print $1":"$2}'`
           docker image ls|grep -i ${{ secrets.DOCKERHUB_USERNAME }}|awk '{print $1":"$2}'|xargs -i docker push {}
diff --git a/.github/workflows/issue.yml → .github/workflows/issue-automation.yml b/.github/workflows/issue.yml → .github/workflows/issue-automation.yml
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-name: ISSUE Standardized Process
+name: Issue Automation
 
 on:
   schedule:
@@ -30,14 +30,14 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'apache/shardingsphere' && github.event_name == 'issue_comment' }}
     steps:
-      - name: Trigger The CI Workflow
+      - name: Trigger the CI workflow
         if: ${{ contains( github.event.comment.body , '/run ci') }} 
         uses: mvasigh/dispatch-action@main
         with:
           token: ${{ secrets.PERSONAL_TOKEN }}
           repo: shardingsphere
           owner: ${{ github.actor }}
-          event_type: rerun-ci
+          event_type: ci-completed
   remove-inactive:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'apache/shardingsphere' && github.event_name == 'issues' && github.event.action == 'reopened' }}
@@ -55,15 +55,15 @@ jobs:
     concurrency: check-inactive  # singleton-run-stage
     if: ${{ github.repository == 'apache/shardingsphere' && github.event_name == 'schedule' }}
     steps:
-      - name: check-inactive   # add `status: inactive` label
+      - name: Check inactive   # add `status: inactive` label
         uses: actions-cool/[email protected] 
         with: 
           actions: 'check-inactive' 
           token: ${{ secrets.GITHUB_TOKEN }} 
           inactive-day: 15
           inactive-label: "status: inactive"
           body: |
-            Hello ${{ github.event.issue.user.login }}, this issue has not received a reply for serveral days.
+            Hello ${{ github.event.issue.user.login }}, this issue has not received a reply for several days.
             This issue is supposed to be closed.
           contents: "heart"
   close-issue:

diff --git 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
@@ -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: