-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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.
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
Minimal changes to use the same version of emscripten on Travis and Circleci. #4486
Conversation
644f2aa
to
fce3307
Compare
8b06cef
to
2cf0ab6
Compare
@axic So this is the minimal set of changes I got running so far... However, the If we want to still merge this, note that we need to reenable the travis and circleci caches first. |
2cf0ab6
to
dc37b11
Compare
@@ -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.21-64bit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So does it needs an emscripten update then?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes - only updating both emscripten and boost currently works - updating either one alone still results in errors that we don't have a solution for so far. However, this only updates the emscripten version on travis to the same version used on circleci and does not update any further than that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, in that case I'm not sure we should merge without running some benchmarks. It is kind of weird, because on circle 1.37.21 compiles with both versions of boost, while on travis 1.37.21 needs the boost upgrade.
Well, we could use the circle output to benchmark against he nightlies, since both versions were created.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think on circle everything is compiled in docker containers, whereas on travis parts are built in a docker container and parts are not - my conjecture would be that that's causing the differences. I'd have to recheck, though.
dc37b11
to
81dd845
Compare
Codecov Report
@@ Coverage Diff @@
## develop #4486 +/- ##
========================================
Coverage 88.09% 88.09%
========================================
Files 308 308
Lines 31247 31247
Branches 3751 3751
========================================
Hits 27528 27528
Misses 2465 2465
Partials 1254 1254
|
Would postpone this to 0.5.1 |
@chriseth Agreed. |
323a4c6
to
81c62e5
Compare
I think this is ready for merging. |
Oh, this was blocked by Remix having 0.5.0 support. That is available as of today on https://remix-alpha.ethereum.org. |
81c62e5
to
119aa10
Compare
Rebased. |
We should mention this in the changelog... but lets wait for travis to finish first. |
-DBoost_PROGRAM_OPTIONS_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_program_options.a \ | ||
-DBoost_REGEX_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_regex.a \ | ||
-DBoost_SYSTEM_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_system.a \ | ||
-DBoost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE="$WORKSPACE"/boost_1_67_0/libboost_unit_test_framework.a \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@christianparpart can you review this file?
Previous travis run was successful: https://travis-ci.org/ethereum/solidity/builds/457964218 |
Experiments with minimal changes to achieve the goal of #3491.
Closes #3491.
This results in: