From 8c9f656eec0ecfa31b6c695416964b4e928aeccc Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 4 May 2023 12:04:46 +0100 Subject: [PATCH] Add path to JDK 17 Change-Id: If6fd6fab4517242f7bad9149ae2fdbdbbca7ef34 --- kokoro/build.sh | 5 ++++- kokoro/continuous.cfg | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kokoro/build.sh b/kokoro/build.sh index c217e995c..456752516 100755 --- a/kokoro/build.sh +++ b/kokoro/build.sh @@ -36,7 +36,10 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses cd $KOKORO_ARTIFACTS_DIR/git/nowinandroid # The build needs Java 17, set it as the default Java version. -sudo update-java-alternatives --set java-1.17.0-openjdk-amd64 +sudo apt-get update +sudo apt-get install -y openjdk-17-jdk +sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java +java -version # Also clear JAVA_HOME variable so java -version is used instead export JAVA_HOME= diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg index e0db4f172..b7f4c4ac8 100644 --- a/kokoro/continuous.cfg +++ b/kokoro/continuous.cfg @@ -1,2 +1,4 @@ # Location of the bash script. -build_file: "nowinandroid/kokoro/build.sh" \ No newline at end of file +build_file: "nowinandroid/kokoro/build.sh" + +gfile_resources: "/x20/projects/java-platform/linux-amd64/jdk-17-latest" \ No newline at end of file