From 24298056dfeea2859e383521b194a1ed211ce949 Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Thu, 7 Sep 2017 13:30:45 -0700
Subject: [PATCH] fix(ci): move deploy instructions to build job

https://circleci.com/docs/2.0/configuration-reference/#deploy
---
 .circleci/config.yml                | 30 +++++------------------------
 {scripts/ci => .circleci}/deploy.sh |  0
 scripts/ci.sh => .circleci/test.sh  |  0
 3 files changed, 5 insertions(+), 25 deletions(-)
 rename {scripts/ci => .circleci}/deploy.sh (100%)
 rename scripts/ci.sh => .circleci/test.sh (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c32c9f08d..bde003945 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,38 +9,18 @@ jobs:
       PROJECT_NAME: "kubernetes-helm"
     steps:
       - checkout
+      - setup_remote_docker
       - run:
           name: install dependencies
           command: make bootstrap
-      - run:
-          name: go env
-          command: go env
       - save_cache:
           key: vendor-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
           paths:
             - vendor
       - run:
           name: test
-          command: ./scripts/ci.sh
-  deployment:
-    working_directory: /go/src/k8s.io/helm
-    docker:
-      - image: golang:1.8
-    environment:
-      PROJECT_NAME: "kubernetes-helm"
-    filters:
-      tags:
-        only: /.*/
-      branches:
-        only: master
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - vendor-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
-      - run:
-          name: go env
-          command: go env
+          command: .circleci/test.sh
+      - run: echo $BLACK
       - deploy:
-        name: deploy
-        command: ./scripts/ci/deploy.sh
+          name:  deploy
+          command: .circleci/deploy.sh
diff --git a/scripts/ci/deploy.sh b/.circleci/deploy.sh
similarity index 100%
rename from scripts/ci/deploy.sh
rename to .circleci/deploy.sh
diff --git a/scripts/ci.sh b/.circleci/test.sh
similarity index 100%
rename from scripts/ci.sh
rename to .circleci/test.sh