Skip to content

Commit e5df093

Browse files
tylerbertrandtylerbertrand
authored
Merge branch 'main' into dependabot/gradle/com.gradle.common-custom-user-data-gradle-plugin-2.0.2
Signed-off-by: Tyler Bertrand <[email protected]>
2 parents 08fc09d + a5b721f commit e5df093

File tree

62 files changed

+547
-4202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+547
-4202
lines changed

‎.github/actions/gradle/experiment-config-cache/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
using: "composite"
1414
steps:
1515
- name: Set up Gradle
16-
uses: gradle/gradle-build-action@v3
16+
uses: gradle/actions/setup-gradle@v3
1717
with:
1818
cache-disabled: true
1919
- name: Run experiment

‎.github/workflows/build-verification.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
java-version: '8'
1919
distribution: 'adopt'
2020
- name: Set up Gradle
21-
uses: gradle/gradle-build-action@v3
21+
uses: gradle/actions/setup-gradle@v3
22+
with:
23+
develocity-access-key: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
2224
- name: Build with Gradle
23-
run: ./gradlew build -i
24-
env:
25-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
25+
run: ./gradlew build

‎.github/workflows/combine-dependabot-prs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: combine-dependabot-prs
20-
uses: github/combine-prs@v5.0.0
20+
uses: github/combine-prs@v5.1.0
2121
with:
2222
branch_regex: ^(dependa|wrapper)bot\/.*$
2323
github_token: ${{ secrets.GH_BOT_GITHUB_TOKEN }}

‎.github/workflows/cross-platform-testing-build-from-source.yml

+20-15
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
java-version: '8'
1616
distribution: 'adopt'
1717
- name: Set up Gradle
18-
uses: gradle/gradle-build-action@v3
18+
uses: gradle/actions/setup-gradle@v3
19+
with:
20+
develocity-access-key: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
1921
- name: Build with Gradle
2022
run: ./gradlew build
21-
env:
22-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
2323
- name: Upload built script artifacts
2424
uses: actions/upload-artifact@v4
2525
with:
@@ -35,31 +35,36 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019]
39-
java-version: [ '8', '11', '17' ]
38+
# Only the latest available version of each OS is tested
39+
# Both macOS 13 and 14 are tested because they use different architectures
40+
os:
41+
- ubuntu-24.04
42+
- macos-13 # x86_64
43+
- macos-14 # aarch64
44+
- windows-2019
45+
# Only LTS versions greater than 8 are tested
46+
java-version: [ '8', '11', '17', '21' ]
4047
include:
41-
- os: ubuntu-20.04
42-
shell: bash
43-
- os: ubuntu-22.04
48+
- os: ubuntu-24.04
4449
shell: bash
45-
- os: macos-11
50+
- os: macos-13
4651
shell: bash
47-
- os: macos-12
52+
- os: macos-14
4853
shell: bash
4954
- os: windows-2019
5055
shell: wsl-bash
5156
defaults:
5257
run:
5358
shell: ${{ matrix.shell }} {0}
5459
env:
55-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
56-
WSLENV: GRADLE_ENTERPRISE_ACCESS_KEY
60+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
61+
WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
5762
steps:
5863
- name: Set up WSL
5964
if: ${{ runner.os == 'Windows' }}
6065
uses: Vampire/setup-wsl@v3
6166
with:
62-
distribution: Ubuntu-22.04
67+
distribution: Ubuntu-24.04
6368
additional-packages: curl unzip wget apt-transport-https gnupg
6469
- name: Set up JDK ${{ matrix.java-version }} on WSL
6570
if: ${{ runner.os == 'Windows' }}
@@ -73,7 +78,7 @@ jobs:
7378
uses: actions/setup-java@v4
7479
with:
7580
java-version: ${{ matrix.java-version }}
76-
distribution: 'temurin'
81+
distribution: ${{ matrix.os == 'macos-14' && 'zulu' || 'temurin' }} # No Temurin JDK 8 distribution for aarch64
7782
- name: Download built script artifacts
7883
uses: actions/download-artifact@v4
7984
with:
@@ -101,7 +106,7 @@ jobs:
101106
- name: Run Gradle Experiment 05
102107
run: |
103108
cd gradle-enterprise-gradle-build-validation
104-
./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/p4ghldkcscfwi -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/
109+
./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/cemwsttqjhzhq -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/
105110
- name: Run Maven Experiment 01
106111
run: |
107112
cd gradle-enterprise-maven-build-validation

‎.github/workflows/cross-platform-testing-use-development-release.yml

+17-12
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,36 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019]
18-
java-version: [ '8', '11', '17' ]
17+
# Only the latest available version of each OS is tested
18+
# Both macOS 13 and 14 are tested because they use different architectures
19+
os:
20+
- ubuntu-24.04
21+
- macos-13 # x86_64
22+
- macos-14 # aarch64
23+
- windows-2019
24+
# Only LTS versions greater than 8 are tested
25+
java-version: [ '8', '11', '17', '21' ]
1926
include:
20-
- os: ubuntu-20.04
27+
- os: ubuntu-24.04
2128
shell: bash
22-
- os: ubuntu-22.04
29+
- os: macos-13
2330
shell: bash
24-
- os: macos-11
25-
shell: bash
26-
- os: macos-12
31+
- os: macos-14
2732
shell: bash
2833
- os: windows-2019
2934
shell: wsl-bash
3035
defaults:
3136
run:
3237
shell: ${{ matrix.shell }} {0}
3338
env:
34-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
35-
WSLENV: GRADLE_ENTERPRISE_ACCESS_KEY
39+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
40+
WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
3641
steps:
3742
- name: Set up WSL
3843
if: ${{ runner.os == 'Windows' }}
3944
uses: Vampire/setup-wsl@v3
4045
with:
41-
distribution: Ubuntu-22.04
46+
distribution: Ubuntu-24.04
4247
additional-packages: curl unzip wget apt-transport-https gnupg
4348
- name: Set up JDK ${{ matrix.java-version }} on WSL
4449
if: ${{ runner.os == 'Windows' }}
@@ -52,7 +57,7 @@ jobs:
5257
uses: actions/setup-java@v4
5358
with:
5459
java-version: ${{ matrix.java-version }}
55-
distribution: 'temurin'
60+
distribution: ${{ matrix.os == 'macos-14' && 'zulu' || 'temurin' }} # No Temurin JDK 8 distribution for aarch64
5661
- name: Download and extract build validation Scripts
5762
run: |
5863
curl -L -O https://github.com/gradle/gradle-enterprise-build-validation-scripts/releases/download/development-latest/gradle-enterprise-gradle-build-validation-dev.zip
@@ -78,7 +83,7 @@ jobs:
7883
- name: Run Gradle Experiment 05
7984
run: |
8085
cd gradle-enterprise-gradle-build-validation
81-
./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/p4ghldkcscfwi -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/
86+
./05-validate-remote-build-caching-ci-local.sh -1 https://ge.solutions-team.gradle.com/s/cemwsttqjhzhq -s https://ge.solutions-team.gradle.com -u https://ge.solutions-team.gradle.com/cache/
8287
- name: Run Maven Experiment 01
8388
run: |
8489
cd gradle-enterprise-maven-build-validation

‎.github/workflows/development-release.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ jobs:
1919
java-version: '8'
2020
distribution: 'adopt'
2121
- name: Set up Gradle
22-
uses: gradle/gradle-build-action@v3
22+
uses: gradle/actions/setup-gradle@v3
23+
with:
24+
develocity-access-key: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
2325
- name: Build with Gradle
2426
run: ./gradlew build githubRelease -i
2527
env:
2628
GITHUB_ACCESS_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
27-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}

‎.github/workflows/production-release.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ jobs:
2121
java-version: '8'
2222
distribution: 'adopt'
2323
- name: Set up Gradle
24-
uses: gradle/gradle-build-action@v3
24+
uses: gradle/actions/setup-gradle@v3
25+
with:
26+
develocity-access-key: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
2527
- name: Build with Gradle
2628
run: ./gradlew build githubRelease -PfinalRelease -i
2729
env:
2830
GITHUB_ACCESS_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
29-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}

‎Gradle.md

-16
Original file line numberDiff line numberDiff line change
@@ -159,22 +159,6 @@ Develocity server at develocity.example.io.
159159
./02-validate-local-build-caching-same-location.sh -i -e -s https://develocity.example.io
160160
```
161161

162-
## Running the experiments without publishing Build Scan data
163-
164-
The scripts that run all builds locally can be configured to not publish any Build Scan data and instead extract the required data
165-
right during the build to surface the state of work avoidance by passing the `-x` or `--disable-build-scan-publishing` command
166-
line argument.
167-
168-
The use of this option requires at least Java 17 to analyze the build data. The JVM version to analyze the build data is
169-
[configurable](#specifying-the-jvm-used-to-analyze-the-build-data). You can still run the builds of the experiments with a JVM
170-
version lower than Java 17.
171-
172-
The use of this configuration option also requires a license file from Gradle Inc. to be present in the root directory of the scripts.
173-
174-
```bash
175-
./02-validate-local-build-caching-same-location.sh -i -x
176-
```
177-
178162
## Specifying the JVM used to analyze the build data
179163

180164
The scripts use a Java-based utility to fetch and analyze the captured build data.

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

‎Maven.md

-16
Original file line numberDiff line numberDiff line change
@@ -157,22 +157,6 @@ Develocity server at develocity.example.io.
157157
./01-validate-local-build-caching-same-location.sh -i -e -s https://develocity.example.io
158158
```
159159

160-
## Running the experiments without publishing Build Scan data
161-
162-
The scripts that run all builds locally can be configured to not publish any Build Scan data and instead extract the required data
163-
right during the build to surface the state of work avoidance by passing the `-x` or `--disable-build-scan-publishing` command
164-
line argument.
165-
166-
The use of this option requires at least Java 17 to analyze the build data. The JVM version to analyze the build data is
167-
[configurable](#specifying-the-jvm-used-to-analyze-the-build-data). You can still run the builds of the experiments with a JVM
168-
version lower than Java 17.
169-
170-
The use of this configuration option also requires a license file from Gradle Inc. to be present in the root directory of the scripts.
171-
172-
```bash
173-
./01-validate-local-build-caching-same-location.sh -i -x
174-
```
175-
176160
## Specifying the JVM used to analyze the build data
177161

178162
The scripts use a Java-based utility to fetch and analyze the captured build data.

0 commit comments

Comments
 (0)