diff options
author | Liang Qi <liang.qi@qt.io> | 2019-03-14 12:34:55 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-03-14 12:36:04 +0100 |
commit | e6e5e7b2ee668a9e8dec78a6f2c392b338fbaf5c (patch) | |
tree | d8927e23704c8f530ca640be7037e0e1f08d1879 /coin/provisioning/common/linux | |
parent | ed3d7f6cf5c15cf595a3d6b195d03f572085840d (diff) | |
parent | 05455843158054656296f89051f594a5a5bfdbc0 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.gitmodules
coin/provisioning/common/macos/docker_testserver.sh
Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab
Diffstat (limited to 'coin/provisioning/common/linux')
-rwxr-xr-x | coin/provisioning/common/linux/emsdk.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..3515b870 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.27" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" -sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" +sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" |