aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2018-05-16 21:17:06 +0100
committerGravatar Yong Tang <yong.tang.github@outlook.com> 2018-05-16 13:17:06 -0700
commit1e471a353ecfaf4bc7df06d9528ae7e312497dac (patch)
treed28e2d1680a90b36059db0fb67793711658a5a10 /Makefile
parentcffa1948ab21e36b3eb4397e23acc9cea6830201 (diff)
downloadcoredns-1e471a353ecfaf4bc7df06d9528ae7e312497dac.tar.gz
coredns-1e471a353ecfaf4bc7df06d9528ae7e312497dac.tar.zst
coredns-1e471a353ecfaf4bc7df06d9528ae7e312497dac.zip
Dep ensure (#1803)
* vendor: don't vendor the context stuff We don't need to vendor this anymore as we moved to the std lib for these. * new stuff showing up with dep ensure * remove go-shlex
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 3 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 4afd7cb2e..1ed989b51 100644
--- a/Makefile
+++ b/Makefile
@@ -26,24 +26,19 @@ testk8s: check
.PHONY: godeps
godeps:
+ # Not vendored so external plugin compile, avoiding:
+ # cannot use c (type *"github.com/mholt/caddy".Controller) as type
+ # *"github.com/coredns/coredns/vendor/github.com/mholt/caddy".Controller like errors.
(cd $(GOPATH)/src/github.com/mholt/caddy 2>/dev/null && git checkout -q master 2>/dev/null || true)
(cd $(GOPATH)/src/github.com/miekg/dns 2>/dev/null && git checkout -q master 2>/dev/null || true)
(cd $(GOPATH)/src/github.com/prometheus/client_golang 2>/dev/null && git checkout -q master 2>/dev/null || true)
- (cd $(GOPATH)/src/golang.org/x/net 2>/dev/null && git checkout -q master 2>/dev/null || true)
- (cd $(GOPATH)/src/golang.org/x/text 2>/dev/null && git checkout -q master 2>/dev/null || true)
go get -u github.com/mholt/caddy
go get -u github.com/miekg/dns
go get -u github.com/prometheus/client_golang/prometheus/promhttp
go get -u github.com/prometheus/client_golang/prometheus
- go get -u golang.org/x/net/context
- go get -u golang.org/x/text
(cd $(GOPATH)/src/github.com/mholt/caddy && git checkout -q v0.10.11)
(cd $(GOPATH)/src/github.com/miekg/dns && git checkout -q v1.0.6)
(cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.8.0)
- (cd $(GOPATH)/src/golang.org/x/net && git checkout -q release-branch.go1.10)
- (cd $(GOPATH)/src/golang.org/x/text && git checkout -q v0.3.0)
- # github.com/flynn/go-shlex is required by mholt/caddy at the moment
- go get -u github.com/flynn/go-shlex
.PHONY: travis
travis: check