Skip to content

Commit 922d9b0

Browse files
committed
script: use jdk14 as boot jdk for jdk15
1 parent 08eb6ea commit 922d9b0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scripts/config.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,15 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
309309
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
310310
# stretch and buster have different versions
311311
if [ "$BUILDER_DISTRO" = "stretch" ]; then
312-
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-13/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
312+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-14/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
313313
else
314-
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-13/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
314+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-14/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
315315
fi
316316
else
317317
# same for both stretch & buster
318-
HOSTJDK="$BUILDDIR/jdk-13+33"
319-
HOSTJDK_FILE="$BUILDDIR/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz"
320-
HOSTJDK_URL="https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz"
318+
HOSTJDK="$BUILDDIR/jdk-14.0.1+7"
319+
HOSTJDK_FILE="$BUILDDIR/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
320+
HOSTJDK_URL="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
321321
fi
322322
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
323323
HOTSPOT_ABI=arm-sflt

0 commit comments

Comments
 (0)