Merge pull request #845 from shalousun/master

feat: release 3.0.6
TongchengOpenSource · Jul 5, 2024 · 15a60a3 · 15a60a3
2 parents 385cd47 + b87aa73
commit 15a60a3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -27,16 +27,12 @@ jobs:
         java-version: '11'
         distribution: 'temurin'
         cache: maven
-    - name: Setup reviewdog
-      uses: reviewdog/action-setup@v1
+    - name: Setup review
+      uses: dbelyaev/action-checkstyle@master
       with:
-        reviewdog_version: latest
-    - name: download checkstyle
-      run: curl -o checkstyle.jar -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-10.17.0/checkstyle-10.17.0-all.jar
-    - name: checkstyle
-      env:
-        REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: java -jar checkstyle.jar -c checkstyle/google_checks.xml -f xml src | reviewdog -f=checkstyle -name="Checkstyle" -reporter=github-check
+        github_token: ${{ secrets.github_token }}
+        reporter: github-pr-review
+        level: warning
     - name: Build with Maven
       run: mvn -B package --file pom.xml
 
diff --git a/Makefile b/Makefile
@@ -5,3 +5,10 @@ release:
 # release with keyname
 release-with-key:
 	mvn clean deploy -P release -DskipTests -Dgpg.keyname=xx
+
+checkstyle-checkstyle:
+	mvn checkstyle:checkstyle
+
+checkstyle-check:
+	mvn checkstyle:check
+
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>smart-doc</artifactId>
     <packaging>jar</packaging>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
 
     <name>smart-doc</name>
     <url>https://github.com/TongchengOpenSource/smart-doc.git</url>
@@ -153,6 +153,26 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-checkstyle-plugin</artifactId>
+                        <version>3.4.0</version>
+                        <configuration>
+                            <configLocation>checkstyle/google_checks.xml</configLocation>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>checkstyle</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <configuration>
+                                    <failOnViolation>true</failOnViolation>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
             <distributionManagement>