From 3ff3a8ec37019292b4a20bebb50894d06e95f515 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 22 Jun 2018 19:18:11 +0200
Subject: [PATCH] ci: Setup abci in dependency step

---
 .circleci/config.yml | 39 +++------------------------------------
 test/test_cover.sh   |  2 +-
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 112e1c1bb..3fc5b6ecd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,6 +32,7 @@ jobs:
           command: |
             export PATH="$GOBIN:$PATH"
             make install
+            cd abci && make install
       - persist_to_workspace:
           root: /tmp/workspace
           paths:
@@ -46,37 +47,6 @@ jobs:
           paths:
             - /go/src/github.com/tendermint/tendermint
 
-  setup_abci:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - restore_cache:
-          key: v2-pkg-cache
-      - restore_cache:
-          key: v2-tree-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Checkout abci
-          command: |
-            commit=$(bash scripts/dep_utils/parse.sh abci)
-            go get -v -u -d github.com/tendermint/abci/...
-            cd /go/src/github.com/tendermint/abci
-            git checkout "$commit"
-      - run:
-          working_directory: /go/src/github.com/tendermint/abci
-          name: Install abci
-          command: |
-            set -ex
-            export PATH="$GOBIN:$PATH"
-            make get_tools
-            make get_vendor_deps
-            make install
-      - run: ls -lah /tmp/workspace/bin
-      - persist_to_workspace:
-          root: /tmp/workspace
-          paths:
-            - "bin/abci*"
-
   build_slate:
     <<: *defaults
     steps:
@@ -199,21 +169,18 @@ workflows:
   test-suite:
     jobs:
       - setup_dependencies
-      - setup_abci:
-          requires:
-            - setup_dependencies
       - lint:
           requires:
             - setup_dependencies
       - test_apps:
           requires:
-            - setup_abci
+            - setup_dependencies
       - test_cover:
           requires:
             - setup_dependencies
       - test_persistence:
           requires:
-            - setup_abci
+            - setup_dependencies
       - test_p2p
       - upload_coverage:
           requires:
diff --git a/test/test_cover.sh b/test/test_cover.sh
index 59ce15b03..5f2dea3ee 100644
--- a/test/test_cover.sh
+++ b/test/test_cover.sh
@@ -6,7 +6,7 @@ set -e
 
 echo "mode: atomic" > coverage.txt
 for pkg in ${PKGS[@]}; do
-	go test -v -timeout 30m -race -coverprofile=profile.out -covermode=atomic "$pkg"
+	go test -timeout 5m -race -coverprofile=profile.out -covermode=atomic "$pkg"
 	if [ -f profile.out ]; then
 		tail -n +2 profile.out >> coverage.txt;
 		rm profile.out