Skip to content

Commit 96ea09d

Browse files
jthurnejthurne
committed
Merge remote-tracking branch 'origin/main' into sorin/consolidation
* origin/main: (80 commits) Bump com.gradle:gradle-enterprise-maven-extension from 1.18.3 to 1.18.4 Add section 'Verifying the setup' (#603) Update broken link to Develocity Configuration sample Fix broken links to sample configuration Bump com.gradle.develocity from 3.17.1 to 3.17.2 Bump com.gradle.common-custom-user-data-gradle-plugin from 2.0 to 2.0.1 Use new gradle/actions/wrapper-validation@v3 Bump gradle/wrapper-validation-action from 2 to 3 Bump com.gradle.develocity from 3.17 to 3.17.1 Upgrade to Develocity Gradle plugin 3.17 Bump com.gradle.common-custom-user-data-gradle-plugin from 1.13 to 2.0 Bump injected Common Custom User Data Gradle plugin version to 2.0 Update README.md Update README.md Bump Gradle Wrapper from 8.6 to 8.7 Bump io.swagger:swagger-annotations from 1.6.13 to 1.6.14 (#581) Bump com.google.guava:guava from 33.0.0-jre to 33.1.0-jre (#580) Bump injected Common Custom User Data Gradle plugin version from 1.12.2 to 1.13 Bump com.gradle:common-custom-user-data-maven-extension Bump com.gradle.common-custom-user-data-gradle-plugin ...
2 parents 5d1f348 + f4180da commit 96ea09d

26 files changed

+198
-146
lines changed

Diff for: ‎.github/actions/gradle/experiment-1/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ runs:
107107
cat $RECEIPT_FILE >> $GITHUB_STEP_SUMMARY
108108
shell: bash
109109
- name: Archive receipt
110-
uses: actions/upload-artifact@v3
110+
uses: actions/upload-artifact@v4
111111
with:
112112
name: experiment-1-receipt
113113
path: gradle-enterprise-gradle-build-validation/.data/01-validate-incremental-building/latest*/exp1-*.receipt

Diff for: ‎.github/actions/gradle/experiment-2/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ runs:
115115
cat $RECEIPT_FILE >> $GITHUB_STEP_SUMMARY
116116
shell: bash
117117
- name: Archive receipt
118-
uses: actions/upload-artifact@v3
118+
uses: actions/upload-artifact@v4
119119
with:
120120
name: experiment-2-receipt
121121
path: gradle-enterprise-gradle-build-validation/.data/02-validate-local-build-caching-same-location/latest*/exp2-*.receipt

Diff for: ‎.github/actions/gradle/experiment-3/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ runs:
115115
cat $RECEIPT_FILE >> $GITHUB_STEP_SUMMARY
116116
shell: bash
117117
- name: Archive receipt
118-
uses: actions/upload-artifact@v3
118+
uses: actions/upload-artifact@v4
119119
with:
120120
name: experiment-3-receipt
121121
path: gradle-enterprise-gradle-build-validation/.data/03-validate-local-build-caching-different-locations/latest*/exp3-*.receipt

Diff for: ‎.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@v2
16+
uses: gradle/gradle-build-action@v3
1717
with:
1818
cache-disabled: true
1919
- name: Run experiment

Diff for: ‎.github/actions/maven/experiment-1/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ runs:
115115
cat $RECEIPT_FILE >> $GITHUB_STEP_SUMMARY
116116
shell: bash
117117
- name: Archive receipt
118-
uses: actions/upload-artifact@v3
118+
uses: actions/upload-artifact@v4
119119
with:
120120
name: experiment-1-receipt
121121
path: gradle-enterprise-maven-build-validation/.data/01-validate-local-build-caching-same-location/latest*/exp1-*.receipt

Diff for: ‎.github/actions/maven/experiment-2/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ runs:
115115
cat $RECEIPT_FILE >> $GITHUB_STEP_SUMMARY
116116
shell: bash
117117
- name: Archive receipt
118-
uses: actions/upload-artifact@v3
118+
uses: actions/upload-artifact@v4
119119
with:
120120
name: experiment-2-receipt
121121
path: gradle-enterprise-maven-build-validation/.data/02-validate-local-build-caching-different-locations/latest*/exp2-*.receipt

Diff for: ‎.github/dependabot.yml

+42
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,45 @@ updates:
2222
schedule:
2323
interval: "daily"
2424
time: "02:00"
25+
# github-actions with directory: "/" only monitors .github/workflows
26+
# https://github.com/dependabot/dependabot-core/issues/6345
27+
- package-ecosystem: "github-actions"
28+
directory: "/.github/actions/gradle/download"
29+
schedule:
30+
interval: "daily"
31+
time: "02:00"
32+
- package-ecosystem: "github-actions"
33+
directory: "/.github/actions/gradle/experiment-1"
34+
schedule:
35+
interval: "daily"
36+
time: "02:00"
37+
- package-ecosystem: "github-actions"
38+
directory: "/.github/actions/gradle/experiment-2"
39+
schedule:
40+
interval: "daily"
41+
time: "02:00"
42+
- package-ecosystem: "github-actions"
43+
directory: "/.github/actions/gradle/experiment-3"
44+
schedule:
45+
interval: "daily"
46+
time: "02:00"
47+
- package-ecosystem: "github-actions"
48+
directory: "/.github/actions/gradle/experiment-config-cache"
49+
schedule:
50+
interval: "daily"
51+
time: "02:00"
52+
- package-ecosystem: "github-actions"
53+
directory: "/.github/actions/maven/download"
54+
schedule:
55+
interval: "daily"
56+
time: "02:00"
57+
- package-ecosystem: "github-actions"
58+
directory: "/.github/actions/maven/experiment-1"
59+
schedule:
60+
interval: "daily"
61+
time: "02:00"
62+
- package-ecosystem: "github-actions"
63+
directory: "/.github/actions/maven/experiment-2"
64+
schedule:
65+
interval: "daily"
66+
time: "02:00"

Diff for: ‎.github/workflows/build-verification.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
- name: Set up JDK 8
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v4
1717
with:
1818
java-version: '8'
1919
distribution: 'adopt'
2020
- name: Set up Gradle
21-
uses: gradle/gradle-build-action@v2
21+
uses: gradle/gradle-build-action@v3
2222
- name: Build with Gradle
2323
run: ./gradlew build -i
2424
env:

Diff for: ‎.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@v3.1.2
20+
uses: github/combine-prs@v5.0.0
2121
with:
2222
branch_regex: ^(dependa|wrapper)bot\/.*$
2323
github_token: ${{ secrets.GH_BOT_GITHUB_TOKEN }}

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
- name: Set up JDK 8
13-
uses: actions/setup-java@v3
13+
uses: actions/setup-java@v4
1414
with:
1515
java-version: '8'
1616
distribution: 'adopt'
1717
- name: Set up Gradle
18-
uses: gradle/gradle-build-action@v2
18+
uses: gradle/gradle-build-action@v3
1919
- name: Build with Gradle
2020
run: ./gradlew build
2121
env:
2222
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
2323
- name: Upload built script artifacts
24-
uses: actions/upload-artifact@v3
24+
uses: actions/upload-artifact@v4
2525
with:
2626
name: artifacts
2727
path: |
@@ -57,9 +57,9 @@ jobs:
5757
steps:
5858
- name: Set up WSL
5959
if: ${{ runner.os == 'Windows' }}
60-
uses: Vampire/setup-wsl@v2
60+
uses: Vampire/setup-wsl@v3
6161
with:
62-
distribution: Ubuntu-20.04
62+
distribution: Ubuntu-22.04
6363
additional-packages: curl unzip wget apt-transport-https gnupg
6464
- name: Set up JDK ${{ matrix.java-version }} on WSL
6565
if: ${{ runner.os == 'Windows' }}
@@ -70,12 +70,12 @@ jobs:
7070
sudo apt-get install -y temurin-${{ matrix.java-version }}-jdk
7171
- name: Set up JDK ${{ matrix.java-version }}
7272
if: ${{ runner.os != 'Windows' }}
73-
uses: actions/setup-java@v3
73+
uses: actions/setup-java@v4
7474
with:
7575
java-version: ${{ matrix.java-version }}
7676
distribution: 'temurin'
7777
- name: Download built script artifacts
78-
uses: actions/download-artifact@v3
78+
uses: actions/download-artifact@v4
7979
with:
8080
name: artifacts
8181
- name: Extract build validation scripts

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
steps:
3737
- name: Set up WSL
3838
if: ${{ runner.os == 'Windows' }}
39-
uses: Vampire/setup-wsl@v2
39+
uses: Vampire/setup-wsl@v3
4040
with:
41-
distribution: Ubuntu-20.04
41+
distribution: Ubuntu-22.04
4242
additional-packages: curl unzip wget apt-transport-https gnupg
4343
- name: Set up JDK ${{ matrix.java-version }} on WSL
4444
if: ${{ runner.os == 'Windows' }}
@@ -49,7 +49,7 @@ jobs:
4949
sudo apt-get install -y temurin-${{ matrix.java-version }}-jdk
5050
- name: Set up JDK ${{ matrix.java-version }}
5151
if: ${{ runner.os != 'Windows' }}
52-
uses: actions/setup-java@v3
52+
uses: actions/setup-java@v4
5353
with:
5454
java-version: ${{ matrix.java-version }}
5555
distribution: 'temurin'

Diff for: ‎.github/workflows/development-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
java-version: '8'
2020
distribution: 'adopt'
2121
- name: Set up Gradle
22-
uses: gradle/gradle-build-action@v2
22+
uses: gradle/gradle-build-action@v3
2323
- name: Build with Gradle
2424
run: ./gradlew build githubRelease -i
2525
env:

Diff for: ‎.github/workflows/gradle-wrapper-validation.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
- name: Validate
13-
uses: gradle/wrapper-validation-action@v1
13+
uses: gradle/actions/wrapper-validation@v3
14+

Diff for: ‎.github/workflows/production-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
- name: Set up JDK 8
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
java-version: '8'
2222
distribution: 'adopt'
2323
- name: Set up Gradle
24-
uses: gradle/gradle-build-action@v2
24+
uses: gradle/gradle-build-action@v3
2525
- name: Build with Gradle
2626
run: ./gradlew build githubRelease -PfinalRelease -i
2727
env:

0 commit comments

Comments
 (0)