From fed7e0c8583133a928a7d9d0d811c0c324e90002 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 2 Oct 2018 11:45:22 +0200
Subject: Merge build & install

---
 .circleci/config.yml | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8940ad0aa..37a10f2f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2
 
 jobs:
-  install-dependencies:
+  build:
     resource_class: medium+
     docker:
       - image: circleci/node:9
@@ -17,21 +17,6 @@ jobs:
       - run:
           name: yarn
           command: yarn --frozen-lockfile install || yarn --frozen-lockfile install
-      - save_cache:
-          key: repo-deps-{{ .Environment.CIRCLE_SHA1 }}
-          paths:
-            - ~/repo
-  build:
-    resource_class: medium+
-    docker:
-      - image: circleci/node:9
-    environment:
-      CONTRACTS_COMMIT_HASH: '9ed05f5'
-    working_directory: ~/repo
-    steps:
-      - restore_cache:
-          keys:
-            - repo-deps-{{ .Environment.CIRCLE_SHA1 }}
       - run: >
             if [ -z "$(git diff --name-only development packages/website)" ]; then
                 yarn build:ci:no_website
@@ -176,21 +161,12 @@ jobs:
     working_directory: ~/repo
     docker:
       - image: circleci/node:9
-    steps:
-      - restore_cache:
-          keys:
-            - repo-deps-{{ .Environment.CIRCLE_SHA1 }}
-      - run: cd packages/tslint-config && yarn build:ci
-      - run: yarn lerna run lint
-      - run: yarn prettier:ci
-  bundle-size:
-    docker:
-      - image: circleci/node:9
-    working_directory: ~/repo
     steps:
       - restore_cache:
           keys:
             - repo-built-{{ .Environment.CIRCLE_SHA1 }}
+      - run: yarn lint
+      - run: yarn prettier:ci
       - run: cd packages/0x.js && yarn build:umd:prod
       - run: yarn bundlesize
   submit-coverage:
@@ -257,10 +233,7 @@ workflows:
   version: 2
   main:
     jobs:
-      - install-dependencies
-      - build:
-          requires:
-            - install-dependencies
+      - build
       - test-contracts-ganache:
           requires:
             - build
@@ -271,9 +244,6 @@ workflows:
           requires:
             - build
       - static-tests:
-          requires:
-            - install-dependencies
-      - bundle-size:
           requires:
             - build
       - test-publish:
-- 
cgit