Merge branch '3.3.x' into 3.4.x

Closes gh-43816
This commit is contained in:
Stéphane Nicoll 2025-01-14 10:41:22 +01:00
commit c66514ca01
2 changed files with 3 additions and 3 deletions

View File

@ -42,12 +42,12 @@ runs:
${{ inputs.java-toolchain == 'true' && '17' || '' }} ${{ inputs.java-toolchain == 'true' && '17' || '' }}
- name: Set Up Gradle With Read/Write Cache - name: Set Up Gradle With Read/Write Cache
if: ${{ inputs.cache-read-only == 'false' }} if: ${{ inputs.cache-read-only == 'false' }}
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1 uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
with: with:
cache-read-only: false cache-read-only: false
develocity-access-key: ${{ inputs.develocity-access-key }} develocity-access-key: ${{ inputs.develocity-access-key }}
- name: Set Up Gradle - name: Set Up Gradle
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1 uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
with: with:
develocity-access-key: ${{ inputs.develocity-access-key }} develocity-access-key: ${{ inputs.develocity-access-key }}
develocity-token-expiry: 4 develocity-token-expiry: 4

View File

@ -55,7 +55,7 @@ jobs:
if: ${{ !vars.COMMERCIAL }} if: ${{ !vars.COMMERCIAL }}
uses: Homebrew/actions/setup-homebrew@7657c9512f50e1c35b640971116425935bab3eea uses: Homebrew/actions/setup-homebrew@7657c9512f50e1c35b640971116425935bab3eea
- name: Set Up Gradle - name: Set Up Gradle
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1 uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
with: with:
cache-read-only: false cache-read-only: false
- name: Configure Gradle Properties - name: Configure Gradle Properties