From 82e6e1b7e9700ec3d640dad03ea9a8124e3b0e8b Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 3 Jul 2020 23:25:10 +0100 Subject: [PATCH 1/2] Fix DOWNLOAD_URL in install-nightly-toolchain.sh --- utils/webassembly/install-nightly-toolchain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/webassembly/install-nightly-toolchain.sh b/utils/webassembly/install-nightly-toolchain.sh index cccfac40c9a62..9f15f2abbfafd 100755 --- a/utils/webassembly/install-nightly-toolchain.sh +++ b/utils/webassembly/install-nightly-toolchain.sh @@ -15,7 +15,7 @@ install_linux() { export $(/usr/bin/curl ${BASE_URL}/ubuntu1804/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') DOWNLOAD_DIR=$(echo $download | sed "s/-ubuntu18.04.tar.gz//g") - DOWNLOAD_URL=${BASE_URL}/${DOWNLOAD_DIR}/${download} + DOWNLOAD_URL=${BASE_URL}/ubuntu1804/${DOWNLOAD_DIR}/${download} /usr/bin/curl ${BASE_URL}/${DOWNLOAD_DIR}/${download} > ${WORKSPACE}/latest_toolchain.tar.gz mkdir -p ${WORKSPACE}/latest_toolchain From db2c7b4e960a076bee3260fdec4e88a861a73714 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sat, 4 Jul 2020 21:05:21 +0100 Subject: [PATCH 2/2] Use DOWNLOAD_URL env var in install-nightly-toolchain --- utils/webassembly/install-nightly-toolchain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/webassembly/install-nightly-toolchain.sh b/utils/webassembly/install-nightly-toolchain.sh index 9f15f2abbfafd..8b61d0a86c9cb 100755 --- a/utils/webassembly/install-nightly-toolchain.sh +++ b/utils/webassembly/install-nightly-toolchain.sh @@ -16,7 +16,7 @@ install_linux() { DOWNLOAD_DIR=$(echo $download | sed "s/-ubuntu18.04.tar.gz//g") DOWNLOAD_URL=${BASE_URL}/ubuntu1804/${DOWNLOAD_DIR}/${download} - /usr/bin/curl ${BASE_URL}/${DOWNLOAD_DIR}/${download} > ${WORKSPACE}/latest_toolchain.tar.gz + /usr/bin/curl $DOWNLOAD_URL > ${WORKSPACE}/latest_toolchain.tar.gz mkdir -p ${WORKSPACE}/latest_toolchain tar xzf ${WORKSPACE}/latest_toolchain.tar.gz -C ${WORKSPACE}/latest_toolchain