Merge pull request #5822 from ethereum/emscripten-1.38.22

Update to emscripten 1.38.22

.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: |

.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

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