diff options
| author | chriseth <chris@ethereum.org> | 2019-01-21 20:56:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 20:56:35 +0800 |
| commit | ec6b6602517ba12d9b3c296515d411cc486a6b42 (patch) | |
| tree | b830339438a42b93af9a0b5b91264434c089a173 | |
| parent | ad20e14c8e81d3cfd785dc4776c22b3d900528e1 (diff) | |
| parent | 128d2811d5aa84b3f155de0ea22fd0a295dc7023 (diff) | |
| download | dexon-solidity-ec6b6602517ba12d9b3c296515d411cc486a6b42.tar.gz dexon-solidity-ec6b6602517ba12d9b3c296515d411cc486a6b42.tar.zst dexon-solidity-ec6b6602517ba12d9b3c296515d411cc486a6b42.zip | |
Merge pull request #5822 from ethereum/emscripten-1.38.22
Update to emscripten 1.38.22
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rwxr-xr-x | scripts/build_emscripten.sh | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 52bb36cf..40aa6268 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,14 +34,14 @@ version: 2 jobs: build_emscripten: docker: - - image: trzeci/emscripten:sdk-tag-1.38.8-64bit + - image: trzeci/emscripten:sdk-tag-1.38.22-64bit environment: TERM: xterm steps: - checkout - restore_cache: name: Restore Boost build - key: &boost-cache-key emscripten-boost-{{ checksum "scripts/travis-emscripten/install_deps.sh" }}{{ checksum "scripts/travis-emscripten/build_emscripten.sh" }} + key: &boost-cache-key emscripten-boost-{{ checksum "scripts/travis-emscripten/install_deps.sh" }}{{ checksum "scripts/build_emscripten.sh" }}{{ checksum "scripts/travis-emscripten/build_emscripten.sh" }} - run: name: Bootstrap Boost command: | diff --git a/.travis.yml b/.travis.yml index a8a68aff..6d3d70e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,7 +114,7 @@ matrix: before_install: - nvm install 8 - nvm use 8 - - docker pull trzeci/emscripten:sdk-tag-1.38.8-64bit + - docker pull trzeci/emscripten:sdk-tag-1.38.22-64bit env: - SOLC_EMSCRIPTEN=On - SOLC_INSTALL_DEPS_TRAVIS=Off @@ -122,6 +122,16 @@ matrix: - SOLC_TESTS=Off - ZIP_SUFFIX=emscripten - SOLC_STOREBYTECODE=On + # Travis doesn't seem to support "dynamic" cache keys where we could include + # the hashes of certain files. Our CircleCI configuration contains the hash of + # relevant emscripten files. + # + # It is important to invalidate the cache with each emscripten update, because + # dependencies, such as boost, might be broken otherwise. + # + # This key here has no significant on anything, apart from caching. Please keep + # it in sync with the version above. + - EMSCRIPTEN_VERSION_KEY="1.38.22" # OS X Mavericks (10.9) # https://en.wikipedia.org/wiki/OS_X_Mavericks diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh index 46521cc5..dbd41113 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.38.8-64bit ./scripts/travis-emscripten/build_emscripten.sh + docker run -v $(pwd):/root/project -w /root/project trzeci/emscripten:sdk-tag-1.38.22-64bit ./scripts/travis-emscripten/build_emscripten.sh fi |