summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2023-03-24 14:04:22 +0000
committerHeikki Halmet <heikki.halmet@qt.io>2023-04-13 05:08:01 +0000
commit2345f01c58fcaa4c071eee3af1da243b144fc104 (patch)
tree9c97e8dc7697beefa83087f219db03ec20e055d2
parent13215b3aad8b5badf0cfc45db571b945ac8207ea (diff)
downloadqt5-2345f01c58fcaa4c071eee3af1da243b144fc104.tar.gz
Provisioning: Use cached emsdk version 3.1.25 for unix
Task-number: QTQAINFRA-5458 Pick-to: 6.5 Change-Id: Ie9a38a38175cfd03ff15a886a5cd1621ae5ced36 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
-rwxr-xr-xcoin/provisioning/common/unix/emsdk.sh33
1 files changed, 28 insertions, 5 deletions
diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh
index cbdb76bb..b3a6b216 100755
--- a/coin/provisioning/common/unix/emsdk.sh
+++ b/coin/provisioning/common/unix/emsdk.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#############################################################################
##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2023 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -41,15 +41,38 @@
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
version="3.1.25"
versionNode="v14.18.2"
+tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
+if uname -a |grep -q Darwin; then
+ tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
+ sha="33a3d1227e1409cfcb42d40c3e50108469bd5930"
+else
+ tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
+ sha="7280f68da2cb232d8b5dca843706cb10e49ab901"
+fi
+cacheUrl="https://ci-files01-hki.intra.qt.io/input/emsdk/${tarBallPackage}"
+target="/tmp/${tarBallPackage}"
mkdir -p /opt
cd /opt
-sudo git clone https://github.com/emscripten-core/emsdk.git
-cd emsdk
-sudo ./emsdk install $version
-sudo ./emsdk activate $version
+echo "URL: $cacheUrl"
+DownloadURL "$cacheUrl" "" "$sha" "$target" || (
+ echo "Emsdk isn't cached. Cloning it"
+ sudo git clone https://github.com/emscripten-core/emsdk.git
+)
+
+if [ -f "$target" ]; then
+ sudo tar -xzf "$target" -C /opt/
+ sudo rm -f "$target"
+else
+ cd emsdk
+ sudo ./emsdk install "$version"
+ sudo ./emsdk activate "$version"
+fi
# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
if uname -a |grep -q Darwin; then