Fix circle

.circleci/config.yml

@@ -13,10 +13,6 @@ jobs:
           name: Install dependencies
           command: |
             yarn
-      - run:
-          name: Get submodules
-          command: |
-            git submodule update --init
       - run:
           name: Run tests
           command: |
@@ -42,15 +38,27 @@ jobs:
   #        command: |
   #          ./scripts/run-colony.sh
 
+  # It would be nice if all this could be a shell script but Circle is
+  # extremely annoying about
+  # a) cacheing
+  # b) sudo
+  # c) scripts
+  # d) being in a docker container.
   e2e-zeppelin:
     docker:
       - image: circleci/node:10.12-stretch
     steps:
       - checkout
-      - run:
-          name: OpenZeppelin E2E
-          command: |
-            sudo URL=$CIRCLE_REPOSITORY_URL BRANCH=$CIRCLE_BRANCH ./scripts/run-zeppelin.sh
+      - run: >
+          sudo rm -rf node_modules &&
+          PR_PATH=$(echo "$CIRCLE_REPOSITORY_URL#$CIRCLE_BRANCH" | sudo sed 's/git@github.com:/https:\/\/github.com\//') &&
+          sudo git clone https://github.com/OpenZeppelin/openzeppelin-solidity.git &&
+          cd openzeppelin-solidity &&
+          sudo sed -i 's/cat coverage\/lcov.info | npx coveralls/echo "No coveralls"/g' scripts/test.sh &&
+          sudo yarn &&
+          sudo yarn remove solidity-coverage --dev &&
+          sudo yarn add "$PR_PATH" --dev &&
+          sudo npm run coverage
 
 workflows:
   version: 2

README.md

@@ -32,7 +32,7 @@ truffle-config.js. See the Network Configuration guide below.
 ### Usage notes:
 + Requires Solidity pragmas >= `0.5.0`.
 + Tests run more slowly while coverage is being generated.
-+ Your contracts will be double-compiled and a (moderately alarming) delay between compilation and
++ Your contracts will be double-compiled and a delay between compilation and
 the beginning of test execution is possible if your contracts are large.
 + solidity-coverage expects a globally installed truffle in your environment / on CI. If you
 prefer to control which Truffle version your tests are run with, please see the FAQ for

scripts/run-zeppelin.sh

@@ -8,8 +8,11 @@ set -o errexit
 PR_PATH=$(echo "$URL#$BRANCH" | sed 's/git@github.com:/https:\/\/github.com\//')
 echo "Installing $PR_PATH"
 
+# Circle caches really agressively?
+sudo rm -rf node_modules
 sudo git clone https://github.com/OpenZeppelin/openzeppelin-solidity.git
 cd openzeppelin-solidity || exit
+sudo rm -rf node_modules
 
 # EDITS
 # Use testrpc-sc ...