Prechádzať zdrojové kódy

Merge pull request #8048 from nextcloud/HamonizeCheckOnCI

Harmonize check CI jobs
Tobias Kaminsky 4 rokov pred
rodič
commit
5511cd4046
2 zmenil súbory, kde vykonal 8 pridanie a 23 odobranie
  1. 8 5
      .github/workflows/check.yml
  2. 0 18
      .github/workflows/ktlint.yml

+ 8 - 5
.github/workflows/detekt.yml → .github/workflows/check.yml

@@ -1,18 +1,21 @@
-name: Detekt
+name: Check
 
 on:
     pull_request:
         branches: [ master, stable-* ]
 
 jobs:
-    detekt:
+    check:
         runs-on: ubuntu-latest
-
+        strategy:
+            fail-fast: false
+            matrix:
+                task: [ detekt, ktlint ]
         steps:
             -   uses: actions/checkout@v2
             -   name: Set up JDK 1.8
                 uses: actions/setup-java@v1
                 with:
                     java-version: 1.8
-            -   name: Run detekt
-                run: ./gradlew detekt
+            -   name: Check ${{ matrix.task }}
+                run: ./gradlew ${{ matrix.task }}

+ 0 - 18
.github/workflows/ktlint.yml

@@ -1,18 +0,0 @@
-name: KtLint
-
-on:
-    pull_request:
-        branches: [ master, stable-* ]
-
-jobs:
-    ktlint:
-        runs-on: ubuntu-latest
-
-        steps:
-            -   uses: actions/checkout@v2
-            -   name: Set up JDK 1.8
-                uses: actions/setup-java@v1
-                with:
-                    java-version: 1.8
-            -   name: Runt ktlint
-                run: ./gradlew ktlint