Merge branch '3.2.x' into 3.3.x
This commit is contained in:
commit
eb2c2a7d8c
|
@ -5,10 +5,10 @@ inputs:
|
|||
required: false
|
||||
default: '17'
|
||||
description: 'The Java version to compile and test with'
|
||||
java-distribution:
|
||||
java-early-access:
|
||||
required: false
|
||||
default: 'liberica'
|
||||
description: 'The Java distribution to use for the build'
|
||||
default: 'false'
|
||||
description: 'Whether the Java version is in early access'
|
||||
java-toolchain:
|
||||
required: false
|
||||
default: 'false'
|
||||
|
@ -35,7 +35,7 @@ runs:
|
|||
with:
|
||||
develocity-access-key: ${{ inputs.develocity-access-key }}
|
||||
java-version: ${{ inputs.java-version }}
|
||||
java-distribution: ${{ inputs.java-distribution }}
|
||||
java-early-access: ${{ inputs.java-early-access }}
|
||||
java-toolchain: ${{ inputs.java-toolchain }}
|
||||
- name: Build
|
||||
id: build
|
||||
|
|
|
@ -5,10 +5,10 @@ inputs:
|
|||
required: false
|
||||
default: '17'
|
||||
description: 'The Java version to use for the build'
|
||||
java-distribution:
|
||||
java-early-access:
|
||||
required: false
|
||||
default: 'liberica'
|
||||
description: 'The Java distribution to use for the build'
|
||||
default: 'false'
|
||||
description: 'Whether the Java version is in early access'
|
||||
java-toolchain:
|
||||
required: false
|
||||
default: 'false'
|
||||
|
@ -27,9 +27,9 @@ runs:
|
|||
- name: Set Up Java
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: ${{ inputs.java-distribution }}
|
||||
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
|
||||
java-version: |
|
||||
${{ inputs.java-version }}
|
||||
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
|
||||
${{ inputs.java-toolchain == 'true' && '17' || '' }}
|
||||
- name: Set Up Gradle
|
||||
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
|
||||
|
|
|
@ -43,7 +43,7 @@ jobs:
|
|||
uses: ./.github/actions/build
|
||||
with:
|
||||
java-version: ${{ matrix.java.version }}
|
||||
java-distribution: ${{ matrix.java.distribution || 'liberica' }}
|
||||
java-early-access: ${{ matrix.java.early-access || 'false' }}
|
||||
java-toolchain: ${{ matrix.java.toolchain }}
|
||||
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
|
||||
- name: Send Notification
|
||||
|
|
Loading…
Reference in New Issue