aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Kirchner <daniel@ekpyron.org>2018-07-11 23:15:03 +0800
committerDaniel Kirchner <daniel@ekpyron.org>2019-01-18 01:31:34 +0800
commit5baac8470be4b82d53939e260d40f38d2fc15e6e (patch)
tree621c5d6dce7084740c03f1ad78fcd991f14b61a9 /scripts
parent6de10cb9da3a81befb050ba9b883bfd4b0524cf6 (diff)
downloaddexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar.gz
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar.zst
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.zip
Use emscripten 1.38.8 on both travis and circle.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_emscripten.sh2
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh8
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 14c497ae..46521cc5 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -30,5 +30,5 @@ set -e
if [[ "$OSTYPE" != "darwin"* ]]; then
./scripts/travis-emscripten/install_deps.sh
- docker run -v $(pwd):/root/project -w /root/project trzeci/emscripten:sdk-tag-1.37.21-64bit ./scripts/travis-emscripten/build_emscripten.sh
+ docker run -v $(pwd):/root/project -w /root/project trzeci/emscripten:sdk-tag-1.38.8-64bit ./scripts/travis-emscripten/build_emscripten.sh
fi
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index 32677460..373f32db 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -49,11 +49,11 @@ fi
WORKSPACE=/root/project
# Increase nodejs stack size
-if [ -e ~/.emscripten ]
+if ! [ -e /emsdk_portable/node/bin/node_orig ]
then
- sed -i -e 's/NODE_JS="nodejs"/NODE_JS=["nodejs", "--stack_size=8192"]/' ~/.emscripten
-else
- echo 'NODE_JS=["nodejs", "--stack_size=8192"]' > ~/.emscripten
+ mv /emsdk_portable/node/bin/node /emsdk_portable/node/bin/node_orig
+ echo -e '#!/bin/sh\nexec /emsdk_portable/node/bin/node_orig --stack-size=8192 $@' > /emsdk_portable/node/bin/node
+ chmod 755 /emsdk_portable/node/bin/node
fi
# Boost