From 71a71f49f879059a09487feacc88c98e1e90afcf Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 24 Feb 2021 14:15:29 +0100 Subject: [PATCH] Harmonize check CI jobs Signed-off-by: Hannes Achleitner --- .github/workflows/{detekt.yml => check.yml} | 13 ++++++++----- .github/workflows/ktlint.yml | 18 ------------------ 2 files changed, 8 insertions(+), 23 deletions(-) rename .github/workflows/{detekt.yml => check.yml} (56%) delete mode 100644 .github/workflows/ktlint.yml diff --git a/.github/workflows/detekt.yml b/.github/workflows/check.yml similarity index 56% rename from .github/workflows/detekt.yml rename to .github/workflows/check.yml index b9fb2bd76e..261effcd27 100644 --- a/.github/workflows/detekt.yml +++ b/.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 }} diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml deleted file mode 100644 index 32b9536085..0000000000 --- a/.github/workflows/ktlint.yml +++ /dev/null @@ -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