This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 92144063ef3 Refactor status check (#25397)
92144063ef3 is described below
commit 92144063ef370997799873be8e9f44d29076eee4
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Fri Apr 28 16:08:50 2023 +0800
Refactor status check (#25397)
* Refactor : refactor the expression for required status check(#25390)
* Refactor : remove the strict option
* Refactor : disable checkstyle check temporary
---------
Co-authored-by: shardingsphere <[email protected]>
---
.asf.yaml | 4 +--
.github/workflows/check-checkstyle.yml | 45 +++++++++++++++++-----------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 717e4bb369d..b098bdf7f20 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -47,9 +47,9 @@ github:
protected_branches:
master:
required_status_checks:
- strict: true
contexts:
- - Check - CheckStyle and License
+ - Check - CheckStyle and License / Check - CheckStyle
+ - Check - CheckStyle and License / Check - License
required_pull_request_reviews:
dismiss_stale_reviews: true
required_approving_review_count: 1
diff --git a/.github/workflows/check-checkstyle.yml
b/.github/workflows/check-checkstyle.yml
index b7d9df2ccff..cb0c9ac2981 100644
--- a/.github/workflows/check-checkstyle.yml
+++ b/.github/workflows/check-checkstyle.yml
@@ -55,25 +55,26 @@ jobs:
runs-on: ubuntu-latest
steps:
- run: echo 1
- check-checkstyle:
- name: Check - CheckStyle
- runs-on: ubuntu-latest
- timeout-minutes: 10
- steps:
- - uses: actions/checkout@v3
- - uses: actions/cache@v3
- with:
- path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{
hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-
- - name: Run CheckStyle
- run: ./mvnw checkstyle:check -T1C
-
- check-license:
- name: Check - License
- timeout-minutes: 10
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- - uses: apache/[email protected]
+#
+# check-checkstyle:
+# name: Check - CheckStyle
+# runs-on: ubuntu-latest
+# timeout-minutes: 10
+# steps:
+# - uses: actions/checkout@v3
+# - uses: actions/cache@v3
+# with:
+# path: ~/.m2/repository
+# key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{
hashFiles('**/pom.xml') }}
+# restore-keys: |
+# ${{ env.REPOSITORY_NAME }}-maven-third-party-
+# - name: Run CheckStyle
+# run: ./mvnw checkstyle:check -T1C
+#
+# check-license:
+# name: Check - License
+# timeout-minutes: 10
+# runs-on: ubuntu-latest
+# steps:
+# - uses: actions/checkout@v3
+# - uses: apache/[email protected]
