Add JDK19 builds.

hpi-swa · Oct 4, 2022 · 23e8955 · 23e8955
1 parent f3bb2bc
commit 23e8955
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-20.04-aarch64, macos-11, windows-2019]
-        java: [11, 17]
+        java: [11, 17, 19]
     env:
       RUN_TESTS: "${{ matrix.os == 'ubuntu-20.04' || matrix.java == 17 }}"
       RUN_WITH_COVERAGE: "${{ matrix.os == 'ubuntu-20.04' && matrix.java == 17 }}"

diff --git a/mx.trufflesqueak/utils.sh b/mx.trufflesqueak/utils.sh
@@ -217,20 +217,7 @@ set-up-dependencies() {
   shallow-clone-graal
   download-trufflesqueak-icon
   download-trufflesqueak-test-image
-
-  case "${java_version}" in
-    "java11")
-      set-up-labsjdk labsjdk-ce-11
-      ;;
-    "java17")
-      set-up-labsjdk labsjdk-ce-17
-      ;;
-    *)
-      echo "Failed to set up ${java_version}"
-      exit 42
-      ;;
-  esac
-
+  set-up-labsjdk "labsjdk-ce-${java_version:4}"
   set-env "INSTALLABLE_TARGET" "$(installable-filename "${java_version}")"
 }