From 682ceb9589ca9369eb7c24a424d27c9e11f5cfbe Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 26 May 2018 12:42:41 -0500
Subject: [PATCH] ci: abstract glide into makefile

---
 .circleci/config.yml | 12 ++++++------
 Makefile             |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dedeabf..2d3a20b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,11 +24,11 @@ jobs:
             - cache
 
       - run:
-          name: Install glide
-          command: curl https://glide.sh/get | sh
+          name: Install dependency management
+          command: make install-dep-mgmt
       - run:
           name: Install dependencies
-          command: glide install
+          command: make vendor
 
       - save_cache:
           key: cache-{{ arch }}-{{ .Branch }}-{{ checksum "glide.lock" }}
@@ -43,11 +43,11 @@ jobs:
       - checkout
 
       - run:
-          name: Install glide
-          command: curl https://glide.sh/get | sh
+          name: Install dependency management
+          command: make install-dep-mgmt
       - run:
           name: Install dependencies
-          command: glide install
+          command: make vendor
 
       - setup_remote_docker
       - run: echo $DOCKER_PASSWORD | docker login -u $DOCKER_USER --password-stdin
diff --git a/Makefile b/Makefile
index e3d3321..2372e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,12 @@ test: vendor
 	go test ./...
 
 vendor:
-	dep ensure -vendor-only
+	glide install
 
 .PHONY: release
 release: vendor
 	curl -sL https://git.io/goreleaser | bash
 
-.PHONY: install-dep
-install-dep:
-	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
\ No newline at end of file
+.PHONY: install-dep-mgmt
+install-dep-mgmt:
+	curl https://glide.sh/get | sh
\ No newline at end of file