Skip to content

Commit

Permalink
Use curl instaed of wget for boot JDK downloads for CentOS6
Browse files Browse the repository at this point in the history
  • Loading branch information
Stewart X Addison committed Oct 6, 2021
1 parent a08e2be commit ecffe83
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build-farm/platform-specific-configurations/linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ if [ ! -d "$(eval echo "\$$BOOT_JDK_VARIABLE")" ]; then
# make-adopt-build-farm.sh has 'set -e'. We need to disable that for
# the fallback mechanism, as downloading of the GA binary might fail.
set +e
wget -q -O - "${apiURL}" | tar xpzf - --strip-components=1 -C "$bootDir"
curl -L "${apiURL}" | tar xpzf - --strip-components=1 -C "$bootDir"
retVal=$?
set -e
if [ $retVal -ne 0 ]; then
Expand All @@ -151,7 +151,7 @@ if [ ! -d "$(eval echo "\$$BOOT_JDK_VARIABLE")" ]; then
apiURL=$(eval echo ${apiUrlTemplate})
echo "Attempting to download EA release of boot JDK version ${JDK_BOOT_VERSION} from ${apiURL}"
set +e
wget -q -O - "${apiURL}" | tar xpzf - --strip-components=1 -C "$bootDir"
curl -L "${apiURL}" | tar xpzf - --strip-components=1 -C "$bootDir"
retVal=$?
set -e
if [ $retVal -ne 0 ]; then
Expand All @@ -163,7 +163,7 @@ if [ ! -d "$(eval echo "\$$BOOT_JDK_VARIABLE")" ]; then
vendor="adoptopenjdk"
apiURL=$(eval echo ${apiUrlTemplate})
echo "Attempting to download GA release of boot JDK version ${JDK_BOOT_VERSION} from ${apiURL}"
wget -q -O - "${apiURL}" | tar xpzf - --strip-components=1 -C "$bootDir"
curl -L "${apiURL}" | tar xpzf - --strip-components=1 -C "$bootDir"
fi
fi
fi
Expand Down Expand Up @@ -222,7 +222,7 @@ if [ "${ARCHITECTURE}" == "riscv64" ] && [ "${NATIVE_API_ARCH}" != "riscv64" ];
rm -rf "$BUILDJDK"
mkdir "$BUILDJDK"
# TOFIX: Switch this back once Semeru has an API to pull the nightly builds.
wget -q -O - "https://api.adoptopenjdk.net/v3/binary/latest/${JAVA_FEATURE_VERSION}/ga/linux/${NATIVE_API_ARCH}/jdk/openj9/normal/adoptopenjdk" | tar xpzf - --strip-components=1 -C "$BUILDJDK"
curl -L "https://api.adoptopenjdk.net/v3/binary/latest/${JAVA_FEATURE_VERSION}/ga/linux/${NATIVE_API_ARCH}/jdk/openj9/normal/adoptopenjdk" | tar xpzf - --strip-components=1 -C "$BUILDJDK"
"$BUILDJDK/bin/java" -version 2>&1 | sed 's/^/CROSSBUILD JDK > /g' || exit 1
CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-build-jdk=$BUILDJDK --disable-ddr"
if [ -d /usr/local/openssl102 ]; then
Expand Down

0 comments on commit ecffe83

Please sign in to comment.