You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2024/09/13 06:44:35 UTC

(shardingsphere) branch master updated: Refactor : refactor schedule workflow (#32847)

This is an automated email from the ASF dual-hosted git repository.

jianglongtao 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 155a3c57e80 Refactor : refactor schedule workflow (#32847)
155a3c57e80 is described below

commit 155a3c57e8069a3128dc1532175279a662871c52
Author: 孙念君 Nianjun Sun <su...@apache.org>
AuthorDate: Fri Sep 13 14:44:29 2024 +0800

    Refactor : refactor schedule workflow (#32847)
---
 .github/workflows/nightly-check.yml   | 82 -----------------------------------
 .github/workflows/schedule-report.yml | 55 ++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/nightly-check.yml b/.github/workflows/nightly-check.yml
index 80202eaff0d..047e0ac66c7 100644
--- a/.github/workflows/nightly-check.yml
+++ b/.github/workflows/nightly-check.yml
@@ -47,36 +47,6 @@ jobs:
       - name: Run SpotBugs
         run: ./mvnw clean install spotbugs:check -Pcheck -T1C
 
-  check-and-report-sonarcloud:
-    if: github.repository == 'apache/shardingsphere'
-    name: Check - SonarCloud
-    needs: global-environment
-    runs-on: ubuntu-latest
-    timeout-minutes: 25
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - uses: actions/cache@v4
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: ${{ needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-maven-third-party-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-maven-third-party-
-      - name: Analyze with SonarCloud
-        env:
-          MAVEN_OPTS: "-XX:+UseG1GC -XX:InitialHeapSize=2g -XX:MaxHeapSize=6g -XX:+UseStringDeduplication"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-        run: ./mvnw -B clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_shardingsphere -DskipTests
-
   checkstyle-report-sonarcloud:
     if: github.repository == 'apache/shardingsphere'
     name: Checkstyle - SonarCloud
@@ -214,55 +184,3 @@ jobs:
         run: |
           sed -i '/<requireMavenVersion>/i \                                    <dependencyConvergence/>' pom.xml
           ./mvnw clean install -DskipTests -T1C -Dmaven.enforcer.fail=true
-
-  check-and-report-jacoco:
-    if: github.repository == 'apache/shardingsphere'
-    name: Check - Jacoco
-    needs: global-environment
-    runs-on: ubuntu-latest
-    timeout-minutes: 80
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup JDK 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 11
-      - uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: shardingsphere-maven-third-party-e2e-cache-${{ github.sha }}
-          restore-keys: |
-            shardingsphere-maven-third-party-e2e-cache-
-            shardingsphere-maven-third-party-
-      - name: Install Project
-        run: ./mvnw clean install -DskipTests -T1C
-      - name: Set up JDK 8 for Jacoco
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 8
-      - name: Build with maven and execute jacoco aggregation script
-        run: |
-          ./mvnw --show-version --batch-mode --no-transfer-progress verify -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false &&
-          chmod +x ./.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh &&
-          ./.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh ${{ github.workspace }}
-      - name: Upload coverage reports to codecov
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ github.workspace }}/target/mergeReport/jacoco.xml
-      - name: Set up JDK 17 for sonar plugin
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-      - name: Upload jacoco report to sonar
-        env:
-          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-        run: ./mvnw -B sonar:sonar -Dsonar.projectKey=apache_shardingsphere -Dsonar.coverage.jacoco.xmlReportPaths=${{ github.workspace }}/target/mergeReport/jacoco.xml
-      - uses: actions/upload-artifact@v4
-        with:
-          name: jacoco-report
-          path: ${{ github.workspace }}/target/mergeReport/jacoco
-
diff --git a/.github/workflows/schedule-report.yml b/.github/workflows/schedule-report.yml
index 63263b94c36..e5e8e90e0f6 100644
--- a/.github/workflows/schedule-report.yml
+++ b/.github/workflows/schedule-report.yml
@@ -19,7 +19,7 @@ name: Schedule - Report
 
 on:
   schedule:
-    - cron: '0 */1 * * *'  # every hour
+    - cron: '0 */1 * * *'  # per hour
   workflow_dispatch:
 
 env:
@@ -32,7 +32,7 @@ jobs:
 
   check-and-report-sonarcloud:
     if: github.repository == 'apache/shardingsphere'
-    name: Check - SonarCloud
+    name: Schedule - SonarCloud report
     needs: global-environment
     runs-on: ubuntu-latest
     timeout-minutes: 40
@@ -59,3 +59,54 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
         run: ./mvnw -B clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_shardingsphere -DskipTests
+  
+  check-and-report-jacoco:
+    if: github.repository == 'apache/shardingsphere'
+    name: Schedule - Jacoco report
+    needs: global-environment
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup JDK 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 11
+      - uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: shardingsphere-maven-third-party-e2e-cache-${{ github.sha }}
+          restore-keys: |
+            shardingsphere-maven-third-party-e2e-cache-
+            shardingsphere-maven-third-party-
+      - name: Install Project
+        run: ./mvnw clean install -DskipTests -T1C
+      - name: Set up JDK 8 for Jacoco
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 8
+      - name: Build with maven and execute jacoco aggregation script
+        run: |
+          ./mvnw --show-version --batch-mode --no-transfer-progress verify -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false &&
+          chmod +x ./.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh &&
+          ./.github/workflows/resources/scripts/unit-test-coverage-merge/code-coverage-merge.sh ${{ github.workspace }}
+      - name: Upload coverage reports to codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ github.workspace }}/target/mergeReport/jacoco.xml
+      - name: Set up JDK 17 for sonar plugin
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Upload jacoco report to sonar
+        env:
+          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+        run: ./mvnw -B sonar:sonar -Dsonar.projectKey=apache_shardingsphere -Dsonar.coverage.jacoco.xmlReportPaths=${{ github.workspace }}/target/mergeReport/jacoco.xml
+      - uses: actions/upload-artifact@v4
+        with:
+          name: jacoco-report
+          path: ${{ github.workspace }}/target/mergeReport/jacoco