This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 061f754ded5 Refactor : refactor workflow content (#27513)
061f754ded5 is described below
commit 061f754ded5c46410101eb5851d7a33bef3f632c
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Thu Jul 27 18:08:05 2023 +0800
Refactor : refactor workflow content (#27513)
* Refactor : refactor workflow content
* Refactor : rename the job
* Add : add name for one step
---
.github/workflows/e2e-operation.yml | 3 ++-
.github/workflows/nightly-build.yml | 10 +++++-----
.github/workflows/nightly-check.yml | 12 ++++++------
.github/workflows/nightly-e2e-operation.yml | 1 +
.github/workflows/nightly-sql-parser.yml | 2 +-
.github/workflows/required-reusable.yml | 4 ++++
.github/workflows/schedule-report.yml | 2 +-
.gitignore | 2 +-
8 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/e2e-operation.yml
b/.github/workflows/e2e-operation.yml
index c53f2600bdd..9f817b59404 100644
--- a/.github/workflows/e2e-operation.yml
+++ b/.github/workflows/e2e-operation.yml
@@ -51,7 +51,7 @@ jobs:
e2e-operation:
if: ${{ needs.global-env.outputs.GLOBAL_IS_JOB_EXECUTABLE == 'true' }}
- name: E2E - ${{ matrix.operation }} on ${{ matrix.image.version }}
+ name: E2E - Operation
needs: [ detect-changed-files, global-env ]
runs-on: ubuntu-latest
timeout-minutes: 40
@@ -70,6 +70,7 @@ jobs:
- env:
changed_operations: ${{
needs.detect-changed-files.outputs.changed_operations }}
current_operation: ${{ matrix.operation }}
+ name: Check if ${{ matrix.operation }} is Changed
run: |
echo "skip_current_step=false" >> $GITHUB_ENV
if [[ ${changed_operations} == '["ignore"]' ]]; then
diff --git a/.github/workflows/nightly-build.yml
b/.github/workflows/nightly-build.yml
index 3bab83bc8b7..dbc6fd39f48 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -39,10 +39,10 @@ jobs:
uses: ./.github/workflows/required-reusable.yml
upload-to-nightlies:
+ if: github.repository == 'apache/shardingsphere'
name: Upload to Nightly Builds
needs: global-env
- if: github.repository == 'apache/shardingsphere'
- runs-on: ${{ needs.global-env.outputs.GLOBAL_RUNS_ON }}
+ runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- uses: actions/cache@v3
@@ -71,7 +71,7 @@ jobs:
remote_key: ${{ secrets.NIGHTLIES_RSYNC_KEY }}
build-proxy-image:
- if: github.repository == 'apache/shardingsphere'
+ if: ${{ needs.global-env.outputs.GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE ==
'true' }}
name: Build Proxy Image
needs: global-env
runs-on: ${{ needs.global-env.outputs.GLOBAL_RUNS_ON }}
@@ -135,11 +135,11 @@ jobs:
./mvnw -am -pl distribution/proxy-native
-Prelease.native,docker.buildx.push.native -B -T1C -DskipTests
-Dproxy.image.repository=${{ env.PROXY_NATIVE }} -Dproxy.image.tag=${{
github.sha }} clean package
build-cache:
- if: github.repository == 'apache/shardingsphere'
+ if: ${{ needs.global-env.outputs.GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE ==
'true' }}
name: Build Project
needs: global-env
runs-on: ${{ needs.global-env.outputs.GLOBAL_RUNS_ON }}
- timeout-minutes: 90
+ timeout-minutes: 15
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
diff --git a/.github/workflows/nightly-check.yml
b/.github/workflows/nightly-check.yml
index bc593e09d87..f13afdb487d 100644
--- a/.github/workflows/nightly-check.yml
+++ b/.github/workflows/nightly-check.yml
@@ -31,7 +31,7 @@ jobs:
uses: ./.github/workflows/required-reusable.yml
check-spotbugs:
- if: (github.repository == 'apache/shardingsphere')
+ if: github.repository == 'apache/shardingsphere'
name: Check - SpotBugs
needs: global-env
runs-on: ubuntu-latest
@@ -48,7 +48,7 @@ jobs:
run: ./mvnw clean install spotbugs:check -T1C
check-and-report-sonarcloud:
- if: (github.repository == 'apache/shardingsphere')
+ if: github.repository == 'apache/shardingsphere'
name: Check - SonarCloud
needs: global-env
runs-on: ubuntu-latest
@@ -78,7 +78,7 @@ jobs:
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')
+ if: github.repository == 'apache/shardingsphere'
name: Checkstyle - SonarCloud
needs: global-env
runs-on: ubuntu-latest
@@ -110,7 +110,7 @@ jobs:
run: ./mvnw -B sonar:sonar -Dsonar.projectKey=apache_shardingsphere
-Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml
check-dead-links:
- if: (github.repository == 'apache/shardingsphere')
+ if: github.repository == 'apache/shardingsphere'
name: Check - Dead Links
runs-on: ubuntu-latest
timeout-minutes: 15
@@ -139,7 +139,7 @@ jobs:
done
check-codeql:
- if: (github.repository == 'apache/shardingsphere')
+ if: github.repository == 'apache/shardingsphere'
name: Check - CodeQL
needs: global-env
runs-on: ubuntu-latest
@@ -172,7 +172,7 @@ jobs:
category: "/language:java"
check-stale:
- if: (github.repository == 'apache/shardingsphere')
+ if: github.repository == 'apache/shardingsphere'
name: Check - Stale Issues
runs-on: ubuntu-latest
timeout-minutes: 10
diff --git a/.github/workflows/nightly-e2e-operation.yml
b/.github/workflows/nightly-e2e-operation.yml
index 60218b258cd..c1f36e51382 100644
--- a/.github/workflows/nightly-e2e-operation.yml
+++ b/.github/workflows/nightly-e2e-operation.yml
@@ -35,6 +35,7 @@ jobs:
uses: ./.github/workflows/required-reusable.yml
e2e-operation-job:
+ if: ${{ needs.global-env.outputs.GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE ==
'true' }}
name: E2E - ${{ matrix.operation }} on ${{ matrix.image.version }}
needs: global-env
runs-on: ${{ needs.global-env.outputs.GLOBAL_RUNS_ON }}
diff --git a/.github/workflows/nightly-sql-parser.yml
b/.github/workflows/nightly-sql-parser.yml
index 66c263eb450..4b27beb34ea 100644
--- a/.github/workflows/nightly-sql-parser.yml
+++ b/.github/workflows/nightly-sql-parser.yml
@@ -35,7 +35,7 @@ jobs:
if: github.repository == 'apache/shardingsphere'
name: CI - JDK ${{ matrix.java-version }} for ${{ matrix.database }}
needs: global-env
- runs-on: ${{ needs.global-env.outputs.GLOBAL_RUNS_ON }}
+ runs-on: ubuntu-latest
timeout-minutes: 90
strategy:
max-parallel: 20
diff --git a/.github/workflows/required-reusable.yml
b/.github/workflows/required-reusable.yml
index c6cf113e0b8..70332a190ed 100644
--- a/.github/workflows/required-reusable.yml
+++ b/.github/workflows/required-reusable.yml
@@ -26,6 +26,8 @@ on:
value: ${{ jobs.init-environment.outputs.GLOBAL_RUNS_ON }}
GLOBAL_IS_JOB_EXECUTABLE:
value: ${{ jobs.init-environment.outputs.GLOBAL_IS_JOB_EXECUTABLE }}
+ GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE:
+ value: ${{
jobs.init-environment.outputs.GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE }}
jobs:
init-environment:
@@ -47,8 +49,10 @@ jobs:
run: |
if [ ${{ toJSON(github.repository) }} = ${{
steps.import-variables.outputs.GLOBAL_REPOSITORY }} ]; then
echo "GLOBAL_IS_JOB_EXECUTABLE=true" >> $GITHUB_OUTPUT
+ echo "GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE=true" >> $GITHUB_OUTPUT
fi
outputs:
GLOBAL_REPOSITORY_NAME: ${{
steps.import-variables.outputs.GLOBAL_REPOSITORY_NAME }}
GLOBAL_RUNS_ON: ${{ steps.import-variables.outputs.GLOBAL_RUNS_ON }}
GLOBAL_IS_JOB_EXECUTABLE: ${{
steps.check-job-executable.outputs.GLOBAL_IS_JOB_EXECUTABLE }}
+ GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE: ${{
steps.check-job-executable.outputs.GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE }}
diff --git a/.github/workflows/schedule-report.yml
b/.github/workflows/schedule-report.yml
index 84d2c0b7abd..7a2cf9919b2 100644
--- a/.github/workflows/schedule-report.yml
+++ b/.github/workflows/schedule-report.yml
@@ -31,7 +31,7 @@ jobs:
uses: ./.github/workflows/required-reusable.yml
check-and-report-sonarcloud:
- if: (github.repository == 'apache/shardingsphere')
+ if: github.repository == 'apache/shardingsphere'
name: Check - SonarCloud
needs: global-env
runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
index c0acc29b56e..231b1113bc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,5 +49,5 @@ Thumbs.db
gen/
*.tokens
-# profiler ignore
+# profiler ignore
.profiler/
