Add Java 21

findepi · Sep 23, 2023 · d8bae60 · d8bae60
1 parent f2b272e
commit d8bae60
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,8 @@ jobs:
             default_image: true
           - jdk_version: java20
             default_image: false
+          - jdk_version: java21
+            default_image: false
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v2
@@ -33,7 +35,9 @@ jobs:
           . ./settings.sh
           ./bin/test-base.sh
           ./bin/test-native.sh
-          ./bin/test-polyglot.sh
+          if [ "${JDK_VERSION}" != "java21" ]; then
+            ./bin/test-polyglot.sh
+          fi
         env:
           JDK_VERSION: ${{ matrix.jdk_version }}
           DEFAULT_IMAGE: ${{ matrix.default_image }}

diff --git a/bin/build.sh b/bin/build.sh
@@ -23,23 +23,37 @@ docker build \
     --tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native" \
     .
 
-docker build \
-    --file Dockerfile.polyglot \
-    --build-arg "GRAAL_VERSION=${GRAAL_VERSION}" \
-    --build-arg "JDK_VERSION=${JDK_VERSION}" \
-    --cache-from "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" \
-    --tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" \
-    .
+# Polyglot image depends on `gu` which is removed from Java21. While it's possible
+# to provide equivalent functionality (e.g. `pyenv install graalpy-community-23.1.0`
+# for Python), it not necessarily makes sense (bigger image). For now, don't build
+# polyglot.
+if [ "${JDK_VERSION}" != "java21" ]; then
+    docker build \
+        --file Dockerfile.polyglot \
+        --build-arg "GRAAL_VERSION=${GRAAL_VERSION}" \
+        --build-arg "JDK_VERSION=${JDK_VERSION}" \
+        --cache-from "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" \
+        --tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" \
+        .
+fi
 
 docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}" "${IMAGE_NAME}:${JDK_VERSION}"
 docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native" "${IMAGE_NAME}:${JDK_VERSION}-native"
-docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-all"
-docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${JDK_VERSION}-polyglot"
-docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${JDK_VERSION}-all"
+
+if [ "${JDK_VERSION}" != "java21" ]; then
+    docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-all"
+    docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${JDK_VERSION}-polyglot"
+    docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:${JDK_VERSION}-all"
+else
+    docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native" "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-all"
+    docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native" "${IMAGE_NAME}:${JDK_VERSION}-all"
+fi
 
 if [ "${DEFAULT_IMAGE}" = "true" ]; then
     docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}" "${IMAGE_NAME}:latest"
     docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-native" "${IMAGE_NAME}:native"
-    docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:polyglot"
+    if [ "${JDK_VERSION}" != "java21" ]; then
+        docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-polyglot" "${IMAGE_NAME}:polyglot"
+    fi
     docker tag "${IMAGE_NAME}:${GRAAL_VERSION}-${JDK_VERSION}-all" "${IMAGE_NAME}:all"
 fi
diff --git a/settings.sh b/settings.sh
@@ -9,6 +9,8 @@ if [ "${JDK_VERSION}" = "java17" ]; then
     GRAAL_JDK_VERSION="17.0.8"
 elif [ "${JDK_VERSION}" = "java20" ]; then
     GRAAL_JDK_VERSION="20.0.2"
+elif [ "${JDK_VERSION}" = "java21" ]; then
+    GRAAL_JDK_VERSION="21.0.0"
 else
     echo "Unknown JDK_VERSION ${JDK_VERSION}" >&2
     exit 1