1 files changed, 28 insertions, 21 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index c544bb484..ebbb9b59e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,13 +25,17 @@ jobs:
           key: yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
             - node_modules/
-      - run: node ./node_modules/lerna/bin/lerna.js bootstrap
-      - run: yarn build
+      - run: >
+            if [ -z "$(git diff --name-only v2-prototype packages/website)" ]; then
+                yarn build --exclude website
+            else
+                yarn build
+            fi
       - save_cache:
           key: repo-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - ~/repo
-  test-1:
+  test-contracts-ganache:
     docker:
       - image: circleci/node:9
     working_directory: ~/repo
@@ -39,26 +43,20 @@ jobs:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
-      - run: yarn wsrun test:circleci @0xproject/contract-wrappers
-      - run: yarn wsrun test:circleci @0xproject/sol-compiler
-      - save_cache:
-          key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
-          paths:
-            - ~/repo/packages/contract-wrappers/coverage/lcov.info
-      - save_cache:
-          key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
-          paths:
-            - ~/repo/packages/sol-compiler/coverage/lcov.info
-  test-contracts:
+      - run: yarn wsrun test:circleci contracts
+  test-contracts-geth:
     docker:
       - image: circleci/node:9
+      - image: albrow/0x-devnet
     working_directory: ~/repo
     steps:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
-      - run: yarn wsrun test:circleci contracts
-  test-2:
+      # HACK(albrow): we need to sleep 15 seconds to ensure the devnet is
+      # initialized
+      - run: sleep 15 && TEST_PROVIDER=geth yarn wsrun test contracts
+  test-rest:
     docker:
       - image: circleci/node:9
     working_directory: ~/repo
@@ -66,6 +64,8 @@ jobs:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
+      - run: yarn wsrun test:circleci @0xproject/contract-wrappers
+      - run: yarn wsrun test:circleci @0xproject/sol-compiler
       - run: yarn wsrun test:circleci @0xproject/assert
       - run: yarn wsrun test:circleci @0xproject/connect
       - run: yarn wsrun test:circleci @0xproject/dev-utils
@@ -74,6 +74,14 @@ jobs:
       - run: yarn wsrun test:circleci @0xproject/sol-cov
       - run: yarn wsrun test:circleci @0xproject/metacoin
       - save_cache:
+          key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/contract-wrappers/coverage/lcov.info
+      - save_cache:
+          key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/sol-compiler/coverage/lcov.info
+      - save_cache:
           key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - ~/repo/packages/assert/coverage/lcov.info
@@ -158,13 +166,13 @@ workflows:
   main:
     jobs:
       - build
-      - test-1:
+      - test-contracts-ganache:
           requires:
             - build
-      - test-2:
+      - test-contracts-geth:
           requires:
             - build
-      - test-contracts:
+      - test-rest:
           requires:
             - build
       - static-tests:
@@ -172,5 +180,4 @@ workflows:
             - build
       - submit-coverage:
           requires:
-            - test-1
-            - test-2
+            - test-rest