Move zeppelin CI to script

.circleci/config.yml

@@ -47,27 +47,16 @@ jobs:
           command: |
             ./scripts/run-colony.sh
 
-  # It would be nice if all this could be a shell script... :/
   e2e-zeppelin:
-    docker:
-      - image: circleci/node:10.12-stretch
+    machine: true
     steps:
       - checkout
-      - run: >
-          sudo rm -rf node_modules &&
-          PR_PATH=$(echo "$CIRCLE_REPOSITORY_URL#$CIRCLE_SHA1" | sudo sed 's/git@github.com:/https:\/\/github.com\//') &&
-          echo "PR_PATH >>>>> $PR_PATH" &&
-          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 sed -i 's/ganache-cli-coverage/testrpc-sc/g' scripts/test.sh &&
-          sudo sed -i 's/--emitFreeLogs true/ /g' scripts/test.sh &&
-          sudo yarn &&
-          sudo yarn remove solidity-coverage --dev &&
-          sudo yarn add "$PR_PATH" --dev &&
-          sudo npm run coverage
+      - <<: *step_install_nvm
+      - run:
+          name: Zeppelin E2E
+          command: |
+            ./scripts/run-zeppelin.sh
 
-  # AND...this doesn't work either! Thanks to truffle "obtain" and circle permission denied.
   e2e-metacoin:
     machine: true
     steps:
@@ -81,8 +70,8 @@ workflows:
   version: 2
   build:
     jobs:
-      #- unit-test
-      #- e2e-zeppelin
+      - unit-test
+      - e2e-zeppelin
       - e2e-metacoin
   nightly:
     triggers:

scripts/run-zeppelin.sh

@@ -3,40 +3,38 @@
 # E2E CI: installs PR candidate on openzeppelin-solidity and runs coverage
 #
 
-set -o errexit
-# Get path to PR branch
-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
+# Get rid of any caches
 sudo rm -rf node_modules
+echo "NVM CURRENT >>>>>" && nvm current
 
-# EDITS
-# Use testrpc-sc ...
-# sed -i 's/ganache-cli-coverage/testrpc-sc/g' scripts/test.sh
-# sed -i 's/--emitFreeLogs true/ /g' scripts/test.sh
+# Use PR env variables (for forks) or fallback on local if PR not available
+SED_REGEX="s/git@github.com:/https:\/\/github.com\//"
 
-# Do not ping coveralls
-sed -i 's/cat coverage\/lcov.info | npx coveralls/echo "No coveralls"/g' scripts/test.sh
+if [[ -v CIRCLE_PR_REPONAME ]]; then
+  PR_PATH="https://github.com/$CIRCLE_PR_USERNAME/$CIRCLE_PR_REPONAME#$CIRCLE_SHA1"
+else
+  PR_PATH=$(echo "$CIRCLE_REPOSITORY_URL#$CIRCLE_SHA1" | sudo sed "$SED_REGEX")
+fi
 
-# Doesn't install inside docker (thanks Circle!)
-echo "Uninstalling solidity-docgen"
-sudo npm uninstall --save-dev solidity-docgen
+echo "PR_PATH >>>>> $PR_PATH"
 
-# Swap installed coverage for PR branch version
-echo "Running: npm install"
-sudo npm install
+# Install Zeppelin
+git clone https://github.com/OpenZeppelin/openzeppelin-solidity.git
+cd openzeppelin-solidity
 
-echo "Running npm uninstall solidity-coverage"
-sudo npm uninstall --save-dev solidity-coverage
+# Update Zeppelin's script to use 0.6.x
+sed -i 's/cat coverage\/lcov.info | npx coveralls/echo "No coveralls"/g' scripts/test.sh
+sed -i 's/ganache-cli-coverage/testrpc-sc/g' scripts/test.sh
+sed -i 's/--emitFreeLogs true/ /g' scripts/test.sh
+
+# Swap installed coverage for PR branch version
+echo ">>>>> npm install"
+npm install
 
-echo "Running npm install PR_PATH"
-sudo npm install --save-dev "$PR_PATH"
+echo ">>>>> npm uninstall --save-dev solidity-coverage"
+npm uninstall --save-dev solidity-coverage
 
-sudo npm run coverage
+echo ">>>>> npm install --save-dev PR_PATH"
+npm install --save-dev "$PR_PATH"
 
-# Trick to 'allowFailure' on CIRCLE
-set -o errexit
+npm run coverage