Fixes for diktat check workflows (#613)

### What's done: * Use config from release for check by release version * Check all modules in snapshot check * Fixing code style
saveourtool · Dec 7, 2020 · ecfee94 · ecfee94
1 parent 4e16a72
commit ecfee94
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml
@@ -12,6 +12,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2.3.3
+        with:
+          # set this to 0 to fetch all tags too and be able to use them later
+          fetch-depth: 0
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
@@ -23,5 +26,12 @@ jobs:
           key: ${{ runner.os }}-maven-diktat-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-diktat-
+      - name: Substitute diktat config with the one from the latest release
+        # fixme: can be done from the fetched repo without additional network request
+        run: |
+          git fetch --tags
+          LATEST_TAG=$(git describe --tags --abbrev=0)
+          DIKTAT_CONFIG=diktat-analysis.yml
+          wget -O $DIKTAT_CONFIG https://raw.githubusercontent.com/cqfn/diKTat/$LATEST_TAG/$DIKTAT_CONFIG
       - name: Run diktat via maven plugin
         run: mvn -B diktat:check@diktat -DskipPluginMarker
diff --git a/.github/workflows/diktat_snapshot.yml b/.github/workflows/diktat_snapshot.yml
@@ -46,7 +46,4 @@ jobs:
           mvn -B versions:set-property -Dproperty=diktat-check.version -DnewVersion=${{ env.BASE_VERSION }}-pre
       - name: Run diktat snapshot via ktlint
         run: |
-          mvn -B diktat:check@diktat --pl diktat-common || echo "LintErrors encountered"
-          mvn -B diktat:check@diktat --pl diktat-maven-plugin || echo "LintErrors encountered"
-          mvn -B diktat:check@diktat --pl diktat-test-framework || echo "LintErrors encountered"
-          mvn -B diktat:check@diktat --pl diktat-rules
+          mvn -B diktat:check@diktat
diff --git a/diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskBase.kt b/diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskBase.kt
@@ -31,6 +31,9 @@ open class DiktatJavaExecTaskBase @Inject constructor(
     @get:Internal
     internal val ignoreFailuresProp: Property<Boolean> = project.objects.property(Boolean::class.javaObjectType)
 
+    /**
+     * Whether diktat should be executed via JavaExec or not.
+     */
     @get:Internal
     internal var shouldRun = true
 
@@ -51,7 +54,8 @@ open class DiktatJavaExecTaskBase @Inject constructor(
             if (diktatExtension.debug) {
                 add("--debug")
             }
-            diktatExtension.inputs
+            diktatExtension
+                .inputs
                 .also {
                     if (it.isEmpty) {
                         /*