From 13c53ef79f8afc83b98f325b64cc97e6f88d04b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wierci=C5=84ski?= <piotr.wiercinski@qt.io>
Date: Mon, 12 Jun 2023 12:08:14 +0200
Subject: [PATCH] wasm: update emscripten to 3.1.37
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 coin/provisioning/common/unix/emsdk.sh     | 10 ++++------
 coin/provisioning/common/windows/emsdk.ps1 |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh
index 3adf2fbf..630c955d 100755
--- a/coin/provisioning/common/unix/emsdk.sh
+++ b/coin/provisioning/common/unix/emsdk.sh
@@ -8,7 +8,7 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-version="3.1.25"
+version="3.1.37"
 versionNode="v14.18.2"
 tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
 if uname -a |grep -q Darwin; then
@@ -24,15 +24,13 @@ target="/tmp/${tarBallPackage}"
 mkdir -p /opt
 cd /opt
 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 rm -f "$target"
 else
+    echo "Emsdk isn't cached. Cloning it"
+    sudo git clone https://github.com/emscripten-core/emsdk.git
     cd emsdk
     sudo ./emsdk install "$version"
     sudo ./emsdk activate "$version"
diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1
index c5d133af..66d32209 100644
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
@@ -5,7 +5,7 @@
 
 # This script will install emscripten needed by WebAssembly
 
-$version = "3.1.25"
+$version = "3.1.37"
 $zipVersion = $version -replace '\.', "_"
 $temp = "$env:tmp"
 $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"