From b8427cca9856e1440070bb4cbc7f8337e824e4d6 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Fri, 19 Jan 2024 12:28:34 -0600
Subject: [PATCH] GHA: Use actions/setup-java for JTReg

---
 .github/actions/get-jtreg/action.yml | 5 +++++
 .github/workflows/build-linux.yml    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/actions/get-jtreg/action.yml b/.github/actions/get-jtreg/action.yml
index 3f5786b22d3..e152a8e4b16 100644
--- a/.github/actions/get-jtreg/action.yml
+++ b/.github/actions/get-jtreg/action.yml
@@ -33,6 +33,11 @@ outputs:
 runs:
   using: composite
   steps:
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin' # See 'Supported distributions' for available options
+        java-version: '19'
+
     - name: 'Get JTReg version configuration'
       id: version
       uses: ./.github/actions/config
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index e4636d0efa0..67b2ba46c4d 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -67,8 +67,8 @@ jobs:
     name: build
     runs-on: ubuntu-20.04
     container:
-      image: debian:bullseye
-      #image: ubuntu:20.04
+      #image: debian:bullseye
+      image: ubuntu:18.04
 
     strategy:
       fail-fast: false