This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new c62c2e308f [chore]replace checkstyle action with mvn checkstyle:check
(#10474)
c62c2e308f is described below
commit c62c2e308f03d78b12347de22bd6f72d4d6482c8
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Thu Jun 30 11:20:50 2022 +0800
[chore]replace checkstyle action with mvn checkstyle:check (#10474)
---
.github/actions/action-checkstyle | 1 -
.github/actions/setup-maven | 1 +
.github/workflows/checkstyle.yaml | 15 ++++++---------
.gitmodules | 6 +++---
fe/check/checkstyle/checkstyle.xml | 2 +-
5 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/.github/actions/action-checkstyle
b/.github/actions/action-checkstyle
deleted file mode 160000
index 9eb1077303..0000000000
--- a/.github/actions/action-checkstyle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9eb107730361c56564c02b2912828d0036e4f18f
diff --git a/.github/actions/setup-maven b/.github/actions/setup-maven
new file mode 160000
index 0000000000..417e1a9899
--- /dev/null
+++ b/.github/actions/setup-maven
@@ -0,0 +1 @@
+Subproject commit 417e1a9899611c0350621d1fb0c2770f35105c69
diff --git a/.github/workflows/checkstyle.yaml
b/.github/workflows/checkstyle.yaml
index 45be252192..cb59e5fad9 100644
--- a/.github/workflows/checkstyle.yaml
+++ b/.github/workflows/checkstyle.yaml
@@ -29,14 +29,11 @@ jobs:
with:
persist-credentials: false
submodules: recursive
- - name: "Run java checkstyle"
- uses: ./.github/actions/action-checkstyle
+ - name: Setup Maven Action
+ uses: ./.github/actions/setup-maven
with:
- checkstyle_config: fe/check/checkstyle/checkstyle.xml
- checkstyle_version: 9.3
- workdir: "./fe"
- reporter: 'github-pr-check'
- github_token: ${{ secrets.GITHUB_TOKEN }}
- fail_on_error: true
- level: error
+ maven-version: 3.8.4
+ - name: Run java checkstyle
+ run:
+ cd fe && mvn clean checkstyle:check
diff --git a/.gitmodules b/.gitmodules
index bb902b43f8..bf839a8ae4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,6 @@
[submodule ".github/actions/clang-format-lint-action"]
path = .github/actions/clang-format-lint-action
url = https://github.com/DoozyX/clang-format-lint-action.git
-[submodule ".github/actions/action-checkstyle"]
- path = .github/actions/action-checkstyle
- url = https://github.com/dbelyaev/action-checkstyle.git
+[submodule ".github/actions/setup-maven"]
+ path = .github/actions/setup-maven
+ url = https://github.com/stCarolas/setup-maven.git
diff --git a/fe/check/checkstyle/checkstyle.xml
b/fe/check/checkstyle/checkstyle.xml
index 9a8ac76787..c51a367893 100644
--- a/fe/check/checkstyle/checkstyle.xml
+++ b/fe/check/checkstyle/checkstyle.xml
@@ -33,7 +33,7 @@ under the License.
</module>
<module name="SuppressionFilter">
- <property name="file" value="fe/check/checkstyle/suppressions.xml"/>
+ <property name="file" value="check/checkstyle/suppressions.xml"/>
<property name="optional" value="true"/>
</module>
<module name="SuppressWithPlainTextCommentFilter">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
