Skip to content

Commit d0d0b38

Browse files
committed
Merge remote-tracking branch 'origin/main' into sorin/consolidation
* origin/main: Bump github/combine-prs from 5.0.0 to 5.1.0 Bump Gradle Wrapper from 8.8 to 8.9 Migrated to gradle/actions/setup-gradle@v3 and removed info logging from build-verification Migrated github actions gradle executions to accessToken auth and renamed the secret to develocity naming
2 parents 76f701f + 95b7aa9 commit d0d0b38

11 files changed

+26
-19
lines changed

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@v3
16+
uses: gradle/actions/setup-gradle@v3
1717
with:
1818
cache-disabled: true
1919
- name: Run experiment

Diff for: .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

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@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 }}

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

+4-4
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:
@@ -52,7 +52,7 @@ jobs:
5252
run:
5353
shell: ${{ matrix.shell }} {0}
5454
env:
55-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
55+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
5656
WSLENV: GRADLE_ENTERPRISE_ACCESS_KEY
5757
steps:
5858
- name: Set up WSL

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
run:
3232
shell: ${{ matrix.shell }} {0}
3333
env:
34-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
35-
WSLENV: GRADLE_ENTERPRISE_ACCESS_KEY
34+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
35+
WSLENV: GRADLE_ENTERPRISE_ACCESS_KEY
3636
steps:
3737
- name: Set up WSL
3838
if: ${{ runner.os == 'Windows' }}

Diff for: .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 }}

Diff for: .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 }}

Diff for: gradle/wrapper/gradle-wrapper.jar

51 Bytes
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

Diff for: gradlew

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

Diff for: gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

0 commit comments

Comments
 (0)