Skip to content

Commit eb2c2a7

Browse files
committed
Merge branch '3.2.x' into 3.3.x
2 parents 8f4ea96 + 00cfe4d commit eb2c2a7

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Diff for: .github/actions/build/action.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ inputs:
55
required: false
66
default: '17'
77
description: 'The Java version to compile and test with'
8-
java-distribution:
8+
java-early-access:
99
required: false
10-
default: 'liberica'
11-
description: 'The Java distribution to use for the build'
10+
default: 'false'
11+
description: 'Whether the Java version is in early access'
1212
java-toolchain:
1313
required: false
1414
default: 'false'
@@ -35,7 +35,7 @@ runs:
3535
with:
3636
develocity-access-key: ${{ inputs.develocity-access-key }}
3737
java-version: ${{ inputs.java-version }}
38-
java-distribution: ${{ inputs.java-distribution }}
38+
java-early-access: ${{ inputs.java-early-access }}
3939
java-toolchain: ${{ inputs.java-toolchain }}
4040
- name: Build
4141
id: build

Diff for: .github/actions/prepare-gradle-build/action.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ inputs:
55
required: false
66
default: '17'
77
description: 'The Java version to use for the build'
8-
java-distribution:
8+
java-early-access:
99
required: false
10-
default: 'liberica'
11-
description: 'The Java distribution to use for the build'
10+
default: 'false'
11+
description: 'Whether the Java version is in early access'
1212
java-toolchain:
1313
required: false
1414
default: 'false'
@@ -27,9 +27,9 @@ runs:
2727
- name: Set Up Java
2828
uses: actions/setup-java@v4
2929
with:
30-
distribution: ${{ inputs.java-distribution }}
30+
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
3131
java-version: |
32-
${{ inputs.java-version }}
32+
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
3333
${{ inputs.java-toolchain == 'true' && '17' || '' }}
3434
- name: Set Up Gradle
3535
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

Diff for: .github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: ./.github/actions/build
4444
with:
4545
java-version: ${{ matrix.java.version }}
46-
java-distribution: ${{ matrix.java.distribution || 'liberica' }}
46+
java-early-access: ${{ matrix.java.early-access || 'false' }}
4747
java-toolchain: ${{ matrix.java.toolchain }}
4848
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
4949
- name: Send Notification

0 commit comments

Comments
 (0)