Skip to content

Use emscripten 1.37.21 on Travis (same as on Circleci) #3491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
axic wants to merge 8 commits into from
Closed

Use emscripten 1.37.21 on Travis (same as on Circleci) #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
827a6d9
Use emscripten 1.37.21 on Travis (same as on Circleci)
axic Feb 12, 2018
68352dc
Enable debugging in emscripten
axic Feb 20, 2018
6932669
Use emscripten 1.37.37 on both travis and circle
axic Apr 20, 2018
14a7aeb
No need to install newer cmake
axic Apr 23, 2018
2050c46
Change .emscripten
axic Apr 30, 2018
53de80b
Bump stack size again
axic Apr 30, 2018
d7709da
f
axic Apr 30, 2018
fd0b27d
f
axic Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ matrix:
before_install:
- nvm install 8
- nvm use 8
- docker pull trzeci/emscripten:sdk-tag-1.35.4-64bit
- docker pull trzeci/emscripten:sdk-tag-1.37.37-64bit
env:
- EMCC_DEBUG=1
- SOLC_EMSCRIPTEN=On
- SOLC_INSTALL_DEPS_TRAVIS=Off
- SOLC_RELEASE=Off
Expand Down
6 changes: 3 additions & 3 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
jobs:
build_emscripten:
docker:
- image: trzeci/emscripten:sdk-tag-1.37.21-64bit
- image: trzeci/emscripten:sdk-tag-1.37.37-64bit
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
- version.txt
test_emscripten_solcjs:
docker:
- image: trzeci/emscripten:sdk-tag-1.37.21-64bit
- image: trzeci/emscripten:sdk-tag-1.37.37-64bit
steps:
- checkout
- attach_workspace:
Expand All @@ -65,7 +65,7 @@ jobs:
test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
test_emscripten_external:
docker:
- image: trzeci/emscripten:sdk-tag-1.37.21-64bit
- image: trzeci/emscripten:sdk-tag-1.37.37-64bit
steps:
- checkout
- attach_workspace:
Expand Down
2 changes: 2 additions & 0 deletions cmake/EthCompilerSettings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
# Abort if linking results in any undefined symbols
# Note: this is on by default in the CMake Emscripten module which we aren't using
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s VERBOSE=1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s STRICT=1")
Copy link
Contributor Author

@axic axic Nov 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ekpyron Don't fully remember these options, but probably worth keeping it on the other PRs.

add_definitions(-DETH_EMSCRIPTEN=1)
endif()
endif()
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_emscripten.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh
docker run -v $(pwd):/root/project -w /root/project trzeci/emscripten:sdk-tag-1.37.37-64bit ./scripts/travis-emscripten/build_emscripten.sh
fi
18 changes: 10 additions & 8 deletions scripts/travis-emscripten/build_emscripten.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,22 @@ if ! type git &>/dev/null; then
apt-get -y install git-core
fi

if ! type wget &>/dev/null; then
# We need wget to install cmake
apt-get update
apt-get -y install wget
fi

WORKSPACE=/root/project


ls -laR /emsdk_portable

ls -laR ~/

# Increase nodejs stack size
if [ -e ~/.emscripten ]
then
sed -i -e 's/NODE_JS="nodejs"/NODE_JS=["nodejs", "--stack_size=8192"]/' ~/.emscripten
cat ~/.emscripten
# /emsdk_portable/node/bin/node
sed -i -e 's/NODE_JS="nodejs"/NODE_JS=["nodejs", "--stack_size=16384"]/' ~/.emscripten
else
echo 'NODE_JS=["nodejs", "--stack_size=8192"]' > ~/.emscripten
nodejs --version
echo 'NODE_JS=["nodejs", "--stack_size=16384"]' > ~/.emscripten
fi


Expand Down