Skip to content

Commit d5397cf

Browse files
jprinetjprinet
authored
Merge branch 'main' into dependabot/github_actions/github-actions-12d2e1d0cf
2 parents 431b3e3 + 559dfbd commit d5397cf

17 files changed

+261
-205
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/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.jar‎

1.65 KB
Binary file not shown.

‎.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎.github/workflow-samples/kotlin-dsl/gradlew‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎.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

0 commit comments

Comments
 (0)