Skip to content

Commit 682ceb9

Browse files
committed
ci: abstract glide into makefile
1 parent c9b5a2c commit 682ceb9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
- cache
2525

2626
- run:
27-
name: Install glide
28-
command: curl https://glide.sh/get | sh
27+
name: Install dependency management
28+
command: make install-dep-mgmt
2929
- run:
3030
name: Install dependencies
31-
command: glide install
31+
command: make vendor
3232

3333
- save_cache:
3434
key: cache-{{ arch }}-{{ .Branch }}-{{ checksum "glide.lock" }}
@@ -43,11 +43,11 @@ jobs:
4343
- checkout
4444

4545
- run:
46-
name: Install glide
47-
command: curl https://glide.sh/get | sh
46+
name: Install dependency management
47+
command: make install-dep-mgmt
4848
- run:
4949
name: Install dependencies
50-
command: glide install
50+
command: make vendor
5151

5252
- setup_remote_docker
5353
- run: echo $DOCKER_PASSWORD | docker login -u $DOCKER_USER --password-stdin

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ test: vendor
22
go test ./...
33

44
vendor:
5-
dep ensure -vendor-only
5+
glide install
66

77
.PHONY: release
88
release: vendor
99
curl -sL https://git.io/goreleaser | bash
1010

11-
.PHONY: install-dep
12-
install-dep:
13-
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
11+
.PHONY: install-dep-mgmt
12+
install-dep-mgmt:
13+
curl https://glide.sh/get | sh

0 commit comments

Comments
 (0)