From 66f62d8b1d1d7c5e448ebe6ac6ff3d6f1e9c4c46 Mon Sep 17 00:00:00 2001 From: Robert Stupp Date: Thu, 7 Jul 2022 10:03:54 +0200 Subject: [PATCH] Workaround spotless plugin bug See #4655, required until https://github.com/diffplug/spotless/issues/1215 is fixed. Similar to https://github.com/projectnessie/cel-java/issues/185. --- .github/workflows/main.yml | 9 +++++++-- .github/workflows/pull-request.yml | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64d1cd49513..d91606faba8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,10 +33,15 @@ jobs: with: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + - name: Gradle / spotless + uses: gradle/gradle-build-action@v2 + with: + arguments: spotlessCheck + - name: Gradle / compile uses: gradle/gradle-build-action@v2 with: - arguments: spotlessCheck checkstyleMain checkstyleTest jar testClasses testJar + arguments: checkstyleMain checkstyleTest jar testClasses testJar - name: Gradle / unit test uses: gradle/gradle-build-action@v2 @@ -46,7 +51,7 @@ jobs: - name: Gradle / check incl. integ-test uses: gradle/gradle-build-action@v2 with: - arguments: check + arguments: check -x spotlessCheck - name: Gradle / Gatling simulations uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index e0b26f916e8..93caaddf590 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -51,10 +51,15 @@ jobs: - name: Setup Java, Maven uses: ./.github/actions/dev-tool-java + - name: Gradle / spotless + uses: gradle/gradle-build-action@v2 + with: + arguments: spotlessCheck + - name: Gradle / compile uses: gradle/gradle-build-action@v2 with: - arguments: spotlessCheck checkstyleMain checkstyleTest jar testClasses testJar + arguments: checkstyleMain checkstyleTest jar testClasses testJar - name: Gradle / unit test uses: gradle/gradle-build-action@v2 @@ -66,7 +71,7 @@ jobs: - name: Gradle / check incl. integ-test uses: gradle/gradle-build-action@v2 with: - arguments: check + arguments: check -x spotlessCheck - name: Gradle / Gatling simulations uses: gradle/gradle-build-action@v2