Skip to content

Commit c13cd2b

Browse files
committed
Change vendoring manager dep to glide
ref: golang/dep#797
1 parent 4ec960a commit c13cd2b

File tree

4 files changed

+137
-5
lines changed

4 files changed

+137
-5
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- docker
88

99
before_install:
10-
- make dep
10+
- make glide
1111
install:
1212
- make deps
1313
script:

Makefile

+12-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,20 @@ clean:
1919
rm -rf vendor/*
2020

2121
.PHONY: deps
22-
deps: dep
23-
dep ensure
22+
deps: glide
23+
# dep ensure
24+
glide install
2425

2526
.PHONY: dep
2627
dep:
2728
go get -u github.com/golang/dep/cmd/dep
2829

30+
.PHONY: glide
31+
glide:
32+
ifeq ($(shell command -v glide 2> /dev/null),)
33+
curl https://glide.sh/get | sh
34+
endif
35+
2936
.PHONY: install
3037
install:
3138
go install $(LDFLAGS)
@@ -35,5 +42,6 @@ test:
3542
go test -cover -v `go list ./... | grep -v /vendor/`
3643

3744
.PHONY: update-deps
38-
update-deps: dep
39-
dep ensure -update
45+
update-deps: glide
46+
# dep ensure -update
47+
glide install

glide.lock

+114
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package: github.com/munisystem/invoker
2+
import:
3+
- package: github.com/hashicorp/hcl
4+
subpackages:
5+
- hcl/ast
6+
- package: github.com/lib/pq
7+
- package: github.com/mitchellh/cli
8+
testImport:
9+
- package: gopkg.in/ory-am/dockertest.v3
10+
version: 3.0.9

0 commit comments

Comments
 (0)