Merge pull request #2893 from ethereum/travis-clang-build

Travis CI: Do not cache build dir

.travis.yml

@@ -174,7 +174,6 @@ cache:
     ccache: true
     directories:
         - boost_1_57_0
-        - build
         - $HOME/.local
 
 install:

scripts/test_emscripten.sh

@@ -29,28 +29,29 @@
 set -e
 
 REPO_ROOT=$(cd $(dirname "$0")/.. && pwd)
+SOLJSON="$REPO_ROOT/build/solc/soljson.js"
 
-cd $REPO_ROOT/build
+DIR=$(mktemp -d)
+(
+    echo "Preparing solc-js..."
+    git clone --depth 1 https://github.com/ethereum/solc-js "$DIR"
+    cd "$DIR"
+    npm install
 
-echo "Preparing solc-js..."
+    # Replace soljson with current build
-rm -rf solc-js
+    echo "Replacing soljson.js"
-git clone https://github.com/ethereum/solc-js
+    rm -f soljson.js
-cd solc-js
+    cp "$SOLJSON" soljson.js
-npm install
 
-# Replace soljson with current build
+    # Update version (needed for some tests)
-echo "Replacing soljson.js"
+    VERSION=$("$REPO_ROOT/scripts/get_version.sh")
-rm -f soljson.js
+    echo "Updating package.json to version $VERSION"
-# Make a copy because paths might not be absolute
+    npm version --no-git-tag-version $VERSION
-cp ../solc/soljson.js soljson.js
 
-# Update version (needed for some tests)
+    echo "Running solc-js tests..."
-VERSION=$(../../scripts/get_version.sh)
+    npm run test
-echo "Updating package.json to version $VERSION"
+)
-npm version $VERSION
+rm -rf "$DIR"
-
-echo "Running solc-js tests..."
-npm run test
 
 echo "Running external tests...."
-"$REPO_ROOT"/test/externalTests.sh "$REPO_ROOT"/build/solc/soljson.js
+"$REPO_ROOT/test/externalTests.sh" "$SOLJSON"

test/externalTests.sh

@@ -38,10 +38,9 @@ SOLJSON="$1"
 
 DIR=$(mktemp -d)
 (
-    cd "$DIR"
     echo "Running Zeppelin tests..."
-    git clone https://github.com/OpenZeppelin/zeppelin-solidity.git
+    git clone --depth 1 https://github.com/OpenZeppelin/zeppelin-solidity.git "$DIR"
-    cd zeppelin-solidity
+    cd "$DIR"
     npm install
     cp "$SOLJSON" ./node_modules/solc/soljson.js
     npm run test