Skip to content

Commit 06b6f0a

Browse files
authored
Split out separate spotless CI check (#6743)
To make it clearer when the only problem with a PR is spotless (and may follow-up with a comment-driven automation to apply spotless to a PR)
1 parent 0e84d10 commit 06b6f0a

File tree

7 files changed

+80
-1
lines changed

7 files changed

+80
-1
lines changed

.github/workflows/build-daily-no-build-cache.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ on:
77
workflow_dispatch:
88

99
jobs:
10+
spotless:
11+
uses: ./.github/workflows/reusable-spotless.yml
12+
with:
13+
no-build-cache: true
14+
secrets:
15+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
16+
1017
assemble:
1118
uses: ./.github/workflows/reusable-assemble.yml
1219
with:

.github/workflows/build-daily.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ on:
77
workflow_dispatch:
88

99
jobs:
10+
spotless:
11+
uses: ./.github/workflows/reusable-spotless.yml
12+
secrets:
13+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
14+
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
15+
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
16+
1017
assemble:
1118
uses: ./.github/workflows/reusable-assemble.yml
1219
secrets:

.github/workflows/build-pull-request.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ concurrency:
88
cancel-in-progress: true
99

1010
jobs:
11+
spotless:
12+
uses: ./.github/workflows/reusable-spotless.yml
13+
with:
14+
cache-read-only: true
15+
1116
assemble:
1217
uses: ./.github/workflows/reusable-assemble.yml
1318
with:

.github/workflows/build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ on:
88
workflow_dispatch:
99

1010
jobs:
11+
spotless:
12+
uses: ./.github/workflows/reusable-spotless.yml
13+
secrets:
14+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
15+
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
16+
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
17+
1118
assemble:
1219
uses: ./.github/workflows/reusable-assemble.yml
1320
secrets:

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
workflow_dispatch:
44

55
jobs:
6+
spotless:
7+
uses: ./.github/workflows/reusable-spotless.yml
8+
69
assemble:
710
uses: ./.github/workflows/reusable-assemble.yml
811

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Reusable - Spotless
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
cache-read-only:
7+
type: boolean
8+
required: false
9+
no-build-cache:
10+
type: boolean
11+
required: false
12+
secrets:
13+
GRADLE_ENTERPRISE_ACCESS_KEY:
14+
required: false
15+
GE_CACHE_USERNAME:
16+
required: false
17+
GE_CACHE_PASSWORD:
18+
required: false
19+
20+
jobs:
21+
spotless:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v3
25+
26+
- name: Set up JDK for running Gradle
27+
uses: actions/setup-java@v3
28+
with:
29+
distribution: temurin
30+
java-version: 17
31+
32+
- name: Spotless
33+
uses: gradle/gradle-build-action@v2
34+
env:
35+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
36+
GE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
37+
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
38+
with:
39+
arguments: spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
40+
cache-read-only: ${{ inputs.cache-read-only }}
41+
# gradle enterprise is used for the build cache
42+
gradle-home-cache-excludes: caches/build-cache-1

.github/workflows/reusable-test.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,15 @@ jobs:
6868
GE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
6969
uses: gradle/gradle-build-action@v2
7070
with:
71-
arguments: check -PtestJavaVersion=${{ matrix.test-java-version }} -PtestJavaVM=${{ matrix.vm }} -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
71+
# spotless is checked separately since it's a common source of failure
72+
arguments: >
73+
check
74+
-x spotlessCheck
75+
-PtestJavaVersion=${{ matrix.test-java-version }}
76+
-PtestJavaVM=${{ matrix.vm }}
77+
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
78+
-Porg.gradle.java.installations.auto-download=false
79+
${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
7280
# only push cache for one matrix option since github action cache space is limited
7381
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
7482
# gradle enterprise is used for the build cache

0 commit comments

Comments
 (0)