mirror of https://github.com/qt/qt5.git
wasm: update emscripten to 3.1.37
Qt 6.6 will require emscripten 3.1.37 Pick-to: 6.6 Change-Id: I24d172b9ba055c690274a99af109b50cd2f79b88 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
This commit is contained in:
parent
c77a1f7e4c
commit
13c53ef79f
|
@ -8,7 +8,7 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||||
# shellcheck source=./DownloadURL.sh
|
# shellcheck source=./DownloadURL.sh
|
||||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||||
|
|
||||||
version="3.1.25"
|
version="3.1.37"
|
||||||
versionNode="v14.18.2"
|
versionNode="v14.18.2"
|
||||||
tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
|
tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
|
||||||
if uname -a |grep -q Darwin; then
|
if uname -a |grep -q Darwin; then
|
||||||
|
@ -24,15 +24,13 @@ target="/tmp/${tarBallPackage}"
|
||||||
mkdir -p /opt
|
mkdir -p /opt
|
||||||
cd /opt
|
cd /opt
|
||||||
echo "URL: $cacheUrl"
|
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
|
if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
|
||||||
sudo tar -xzf "$target" -C /opt/
|
sudo tar -xzf "$target" -C /opt/
|
||||||
sudo rm -f "$target"
|
sudo rm -f "$target"
|
||||||
else
|
else
|
||||||
|
echo "Emsdk isn't cached. Cloning it"
|
||||||
|
sudo git clone https://github.com/emscripten-core/emsdk.git
|
||||||
cd emsdk
|
cd emsdk
|
||||||
sudo ./emsdk install "$version"
|
sudo ./emsdk install "$version"
|
||||||
sudo ./emsdk activate "$version"
|
sudo ./emsdk activate "$version"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# This script will install emscripten needed by WebAssembly
|
# This script will install emscripten needed by WebAssembly
|
||||||
|
|
||||||
$version = "3.1.25"
|
$version = "3.1.37"
|
||||||
$zipVersion = $version -replace '\.', "_"
|
$zipVersion = $version -replace '\.', "_"
|
||||||
$temp = "$env:tmp"
|
$temp = "$env:tmp"
|
||||||
$cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
|
$cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
|
||||||
|
|
Loading…
Reference in New Issue