From 923675966788625f70b39ad3ad790981396d6122 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Thu, 21 Mar 2024 08:04:19 +0000
Subject: [PATCH] Switch to Liberica distribution for Java 22 CI

Closes gh-40044
---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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