Skip to content

Commit 62d6a60

Browse files
committed
CI: Fix Gradle cache usages
The GH action `ci-incr-build-cache-prepare` calls the `setup-gradle` action with the "right" parameters, so the call of `setup-gradle` in jobs that use `ci-incr-build-cache-prepare` is superfluous. But this also renders the caching ineffective as `setup-gradle` is called w/o `cache-read-only: true` in "child jobs", which then attempt to store their Gradle cache contents. This leads to attempty storing the Gradle cache in `Post Setup Gradle` steps of the "child" jobs, conflicting with other child jobs and also conflicting with `Store Gradle Cache` purpose.
1 parent 8cc0fad commit 62d6a60

File tree

4 files changed

+3
-30
lines changed

4 files changed

+3
-30
lines changed

.github/workflows/gradle.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ jobs:
4646
with:
4747
java-version: '21'
4848
distribution: 'temurin'
49-
- name: Setup Gradle
50-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
51-
with:
52-
validate-wrappers: false
5349
- name: Prepare Gradle build cache
5450
uses: ./.github/actions/ci-incr-build-cache-prepare
5551
- name: Run unit tests
@@ -88,10 +84,6 @@ jobs:
8884
with:
8985
java-version: '21'
9086
distribution: 'temurin'
91-
- name: Setup Gradle
92-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
93-
with:
94-
validate-wrappers: false
9587
- name: Prepare Gradle build cache
9688
uses: ./.github/actions/ci-incr-build-cache-prepare
9789
- name: Run Quarkus tests
@@ -128,10 +120,6 @@ jobs:
128120
with:
129121
java-version: '21'
130122
distribution: 'temurin'
131-
- name: Setup Gradle
132-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
133-
with:
134-
validate-wrappers: false
135123
- name: Prepare Gradle build cache
136124
uses: ./.github/actions/ci-incr-build-cache-prepare
137125
- name: Run integration tests
@@ -168,10 +156,6 @@ jobs:
168156
with:
169157
java-version: '21'
170158
distribution: 'temurin'
171-
- name: Setup Gradle
172-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
173-
with:
174-
validate-wrappers: false
175159
- name: Collect partial Gradle build caches
176160
uses: ./.github/actions/ci-incr-build-cache-prepare
177161
with:

.github/workflows/nightly.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ jobs:
5252
with:
5353
java-version: '21'
5454
distribution: 'temurin'
55-
- name: Setup Gradle
56-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
57-
with:
58-
validate-wrappers: false
55+
56+
- name: Prepare Gradle build cache
57+
uses: ./.github/actions/ci-incr-build-cache-prepare
5958
- name: Publish SNAPSHOTs to Apache Nexus Repository
6059
run: ./gradlew publishToApache
6160
env:

.github/workflows/regtest.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ jobs:
4040
java-version: '21'
4141
distribution: 'temurin'
4242

43-
- name: Setup Gradle
44-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
45-
with:
46-
validate-wrappers: false
47-
4843
- name: Prepare Gradle build cache
4944
uses: ./.github/actions/ci-incr-build-cache-prepare
5045

.github/workflows/spark_client_regtests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ jobs:
4040
java-version: '21'
4141
distribution: 'temurin'
4242

43-
- name: Setup Gradle
44-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4
45-
with:
46-
validate-wrappers: false
47-
4843
- name: Prepare Gradle build cache
4944
uses: ./.github/actions/ci-incr-build-cache-prepare
5045

0 commit comments

Comments
 (0)