Skip to content

Commit 766dc9c

Browse files
authored
Merge pull request #75 from JakubVanek/feature/self-sufficient-jdk15
[scripts] feat: make jdk15 depend only on build jdk15, not jdk14
2 parents e1afdfd + 7ae4354 commit 766dc9c

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
@@ -302,15 +302,15 @@ elif [ "$JDKVER" == "15" ]; then
302302
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
303303
# stretch and buster have different versions
304304
if [ "$BUILDER_DISTRO" = "stretch" ]; then
305-
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-14/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
305+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-15/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
306306
else
307-
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-14/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
307+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-15/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
308308
fi
309309
else
310310
# same for both stretch & buster
311-
HOSTJDK="$BUILDDIR/jdk-14.0.1+7"
312-
HOSTJDK_FILE="$BUILDDIR/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
313-
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"
311+
HOSTJDK="$BUILDDIR/jdk-15.0.1+9"
312+
HOSTJDK_FILE="$BUILDDIR/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz"
313+
HOSTJDK_URL="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz"
314314
fi
315315
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
316316
HOTSPOT_ABI=arm-sflt

0 commit comments

Comments
 (0)