Skip to content

Commit 896b9fa

Browse files
jprinetjprinet
committed
Run tests on Gradle release candidate and current with JDK 17 as required since Gradle 9
1 parent 3992109 commit 896b9fa

8 files changed

+115
-45
lines changed

‎.github/actions/init-integ-test/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
java-version:
55
description: 'Java version to use'
66
required: false
7-
default: '11'
7+
default: '17'
88

99
runs:
1010
using: "composite"

‎.github/workflows/ci-init-script-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2828
with:
2929
distribution: temurin
30-
java-version: 11
30+
java-version: 17
3131
- name: Setup Gradle
3232
# Use a released version to avoid breakages
3333
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

‎.github/workflows/integ-test-build-scan-publish.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,27 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
28+
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
2929
os: ${{fromJSON(inputs.runner-os)}}
30+
include:
31+
- java-version: 17
32+
- gradle: '8.14.3'
33+
java-version: 11
34+
- gradle: '7.6.2'
35+
java-version: 11
36+
- gradle: '6.9.4'
37+
java-version: 11
38+
- gradle: '5.6.4'
39+
java-version: 11
40+
3041
runs-on: ${{ matrix.os }}
3142
steps:
3243
- name: Checkout sources
3344
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3445
- name: Initialize integ-test
3546
uses: ./.github/actions/init-integ-test
47+
with:
48+
java-version: ${{ matrix.java-version }}
3649

3750
- name: Setup Gradle
3851
id: setup-gradle

‎.github/workflows/integ-test-caching-config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
- name: Initialize integ-test
3535
uses: ./.github/actions/init-integ-test
3636

37+
3738
- name: Setup Gradle
3839
uses: ./setup-gradle
3940
with:

‎.github/workflows/integ-test-dependency-submission.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,19 +231,35 @@ jobs:
231231
fail-fast: false
232232
matrix:
233233
os: ${{fromJSON(inputs.runner-os)}}
234-
gradle: ['8.0.2', '7.6.4', '7.1.1', '6.9.4', '6.0.1', '5.6.4', '5.2.1']
234+
gradle: ['9.0.0', '8.14.3', '8.0.2', '7.6.4', '7.1.1', '6.9.4', '6.0.1', '5.6.4', '5.2.1']
235235
include:
236+
- java-version: 17
237+
- gradle: '8.14.3'
238+
java-version: 11
239+
- gradle: '8.0.2'
240+
java-version: 11
241+
- gradle: '7.6.4'
242+
java-version: 11
243+
- gradle: '7.1.1'
244+
java-version: 11
245+
- gradle: '6.9.4'
246+
java-version: 11
247+
- gradle: '6.0.1'
248+
java-version: 11
236249
- gradle: '5.6.4'
250+
java-version: 11
237251
build-root-suffix: -gradle-5
238252
- gradle: '5.2.1'
253+
java-version: 11
239254
build-root-suffix: -gradle-5
240255
runs-on: ${{ matrix.os }}
241256
steps:
242257
- name: Checkout sources
243258
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
244259
- name: Initialize integ-test
245260
uses: ./.github/actions/init-integ-test
246-
261+
with:
262+
java-version: ${{ matrix.java-version }}
247263
- name: Generate and submit dependencies
248264
uses: ./dependency-submission
249265
with:

‎.github/workflows/integ-test-detect-toolchains.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
shell: bash
4747
working-directory: .github/workflow-samples/groovy-dsl
4848
run: |
49-
grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
49+
grep -q 'Eclipse Temurin JDK 8' output.txt || (echo "::error::Did not detect preinstalled JDK 8" && exit 1)
5050
grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
5151
grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
5252
grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)
@@ -64,16 +64,16 @@ jobs:
6464
- name: Initialize integ-test
6565
uses: ./.github/actions/init-integ-test
6666

67-
- name: Setup Java 20
67+
- name: Setup Java 16
6868
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6969
with:
7070
distribution: 'temurin'
71-
java-version: 20
72-
- name: Setup Java 16
71+
java-version: 16
72+
- name: Setup Java 20
7373
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
7474
with:
7575
distribution: 'temurin'
76-
java-version: 16
76+
java-version: 20
7777
- name: Setup Gradle
7878
uses: ./setup-gradle
7979
- name: List detected toolchains
@@ -92,7 +92,7 @@ jobs:
9292
shell: bash
9393
working-directory: .github/workflow-samples/groovy-dsl
9494
run: |
95-
grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
95+
grep -q 'Eclipse Temurin JDK 8' output.txt || (echo "::error::Did not detect preinstalled JDK 8" && exit 1)
9696
grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
9797
grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
9898
grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)

‎.github/workflows/integ-test-inject-develocity.yml‎

Lines changed: 55 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,23 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
31+
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
3232
os: ${{fromJSON(inputs.runner-os)}}
3333
plugin-version: ['3.16.2', '4.1']
3434
include:
35-
- plugin-version: '3.16.2'
36-
accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
37-
- plugin-version: '4.1'
38-
accessKeyEnv: DEVELOCITY_ACCESS_KEY
35+
- java-version: 17
36+
- gradle: '8.14.3'
37+
java-version: 11
38+
- gradle: '7.6.2'
39+
java-version: 11
40+
- gradle: '6.9.4'
41+
java-version: 11
42+
- gradle: '5.6.4'
43+
java-version: 11
44+
- plugin-version: '3.16.2'
45+
accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
46+
- plugin-version: '4.1'
47+
accessKeyEnv: DEVELOCITY_ACCESS_KEY
3948
runs-on: ${{ matrix.os }}
4049
env:
4150
DEVELOCITY_INJECTION_ENABLED: true
@@ -49,7 +58,8 @@ jobs:
4958
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5059
- name: Initialize integ-test
5160
uses: ./.github/actions/init-integ-test
52-
61+
with:
62+
java-version: ${{ matrix.java-version }}
5363
- name: Setup Gradle
5464
id: setup-gradle
5565
uses: ./setup-gradle
@@ -80,15 +90,27 @@ jobs:
8090
strategy:
8191
fail-fast: false
8292
matrix:
83-
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
93+
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
8494
os: ${{fromJSON(inputs.runner-os)}}
8595
plugin-version: ['3.16.2', '4.1']
96+
include:
97+
- java-version: 17
98+
- gradle: '8.14.3'
99+
java-version: 11
100+
- gradle: '7.6.2'
101+
java-version: 11
102+
- gradle: '6.9.4'
103+
java-version: 11
104+
- gradle: '5.6.4'
105+
java-version: 11
86106
runs-on: ${{ matrix.os }}
87107
steps:
88108
- name: Checkout sources
89109
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
90110
- name: Initialize integ-test
91111
uses: ./.github/actions/init-integ-test
112+
with:
113+
java-version: ${{ matrix.java-version }}
92114
- name: Setup Gradle
93115
id: setup-gradle
94116
uses: ./setup-gradle
@@ -124,16 +146,27 @@ jobs:
124146
strategy:
125147
fail-fast: false
126148
matrix:
127-
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
149+
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
128150
os: ${{fromJSON(inputs.runner-os)}}
129151
plugin-version: [ '3.16.2', '4.1' ]
152+
include:
153+
- java-version: 17
154+
- gradle: '8.14.3'
155+
java-version: 11
156+
- gradle: '7.6.2'
157+
java-version: 11
158+
- gradle: '6.9.4'
159+
java-version: 11
160+
- gradle: '5.6.4'
161+
java-version: 11
130162
runs-on: ubuntu-latest
131163
steps:
132164
- name: Checkout sources
133165
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
134166
- name: Initialize integ-test
135167
uses: ./.github/actions/init-integ-test
136-
168+
with:
169+
java-version: ${{ matrix.java-version }}
137170
- name: Setup Gradle
138171
id: setup-gradle
139172
uses: ./setup-gradle
@@ -155,15 +188,27 @@ jobs:
155188
strategy:
156189
fail-fast: false
157190
matrix:
158-
gradle: ['current', '7.6.2', '6.9.4', '5.6.4']
191+
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
159192
os: ${{fromJSON(inputs.runner-os)}}
160193
plugin-version: [ '3.16.2', '4.1' ]
194+
include:
195+
- java-version: 17
196+
- gradle: '8.14.3'
197+
java-version: 11
198+
- gradle: '7.6.2'
199+
java-version: 11
200+
- gradle: '6.9.4'
201+
java-version: 11
202+
- gradle: '5.6.4'
203+
java-version: 11
161204
runs-on: ${{ matrix.os }}
162205
steps:
163206
- name: Checkout sources
164207
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
165208
- name: Initialize integ-test
166209
uses: ./.github/actions/init-integ-test
210+
with:
211+
java-version: ${{ matrix.java-version }}
167212
- name: Setup Gradle
168213
id: setup-gradle
169214
uses: ./setup-gradle

‎.github/workflows/integ-test-provision-gradle-versions.yml‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737
- name: Initialize integ-test
3838
uses: ./.github/actions/init-integ-test
39+
with:
40+
java-version: '11'
3941

4042
- name: Setup Gradle with v6.9
4143
uses: ./setup-gradle
@@ -52,6 +54,19 @@ jobs:
5254
- name: Test uses Gradle v7.1.1
5355
working-directory: .github/workflow-samples/no-wrapper
5456
run: gradle help "-DgradleVersionCheck=7.1.1"
57+
# Configure JDK 17 for Gradle 9 and later
58+
- name: Setup Java
59+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
60+
with:
61+
distribution: temurin
62+
java-version: 17
63+
- name: Setup Gradle with release-candidate
64+
uses: ./setup-gradle
65+
with:
66+
gradle-version: release-candidate
67+
- name: Test use release-candidate
68+
working-directory: .github/workflow-samples/no-wrapper
69+
run: gradle help
5570
- name: Setup Gradle with current
5671
id: gradle-current
5772
uses: ./setup-gradle
@@ -61,42 +76,22 @@ jobs:
6176
working-directory: .github/workflow-samples/no-wrapper
6277
run: gradle help
6378
- name: Check current version output parameter
64-
if: ${{ !startsWith(steps.gradle-current.outputs.gradle-version , '8.') }}
79+
if: ${{ !startsWith(steps.gradle-current.outputs.gradle-version , '9.') }}
6580
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
6681
with:
6782
script: |
6883
core.setFailed('Gradle version parameter not set correctly: value was "${{ steps.gradle-current.outputs.gradle-version }}"')
6984
70-
provision-gradle-with-jdk-17:
71-
strategy:
72-
max-parallel: 1
73-
fail-fast: false
74-
matrix:
75-
os: ${{fromJSON(inputs.runner-os)}}
76-
runs-on: ${{ matrix.os }}
77-
steps:
78-
- name: Checkout sources
79-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
80-
- name: Initialize integ-test
81-
uses: ./.github/actions/init-integ-test
82-
with:
83-
java-version: '17'
84-
- name: Setup Gradle with release-candidate
85-
uses: ./setup-gradle
86-
with:
87-
gradle-version: release-candidate
88-
- name: Test use release-candidate
89-
working-directory: .github/workflow-samples/no-wrapper
90-
run: gradle help
91-
9285
provision-gradle-version:
9386
strategy:
9487
fail-fast: false
9588
matrix:
96-
gradle: ['8.14.2', '8.12', '8.12-rc-1', '8.9', '8.1', '7.6.4', '6.9.4', '5.6.4', '4.10.3', '3.5.1']
89+
gradle: ['9.0.0', '8.14.2', '8.12', '8.12-rc-1', '8.9', '8.1', '7.6.4', '6.9.4', '5.6.4', '4.10.3', '3.5.1']
9790
os: ${{fromJSON(inputs.runner-os)}}
9891
include:
9992
- java-version: 11
93+
- gradle: '9.0.0'
94+
java-version: 17
10095
- gradle: '5.6.4'
10196
build-root-suffix: -gradle-5
10297
- gradle: '4.10.3'

0 commit comments

Comments
 (0)