Merge branch '3.2.x'

Closes gh-40045
This commit is contained in:
Andy Wilkinson 2024-03-21 08:04:48 +00:00
commit c010e002eb
1 changed files with 2 additions and 4 deletions

View File

@ -21,9 +21,7 @@ jobs:
- version: 21 - version: 21
toolchain: true toolchain: true
- version: 22 - version: 22
early-access: true
toolchain: true toolchain: true
distribution: temurin
exclude: exclude:
- os: - os:
name: Linux name: Linux
@ -35,9 +33,9 @@ jobs:
- name: Set up Java - name: Set up Java
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: ${{ matrix.java.distribution || 'liberica' }} distribution: liberica
java-version: | java-version: |
${{ matrix.java.early-access && format('{0}-ea', matrix.java.version) || matrix.java.version }} ${{ matrix.java.version }}
${{ matrix.java.toolchain && '17' || '' }} ${{ matrix.java.toolchain && '17' || '' }}
- name: Prepare Windows runner - name: Prepare Windows runner
if: ${{ runner.os == 'Windows' }} if: ${{ runner.os == 'Windows' }}