aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yong Tang <yong.tang.github@outlook.com> 2018-01-10 12:52:02 -0800
committerGravatar Miek Gieben <miek@miek.nl> 2018-01-10 20:52:02 +0000
commit949b4534729bcd4512c996821ff32e6f0a5d6765 (patch)
tree267f4ef88a731b627116ff36c55de3cff6fc30e1
parentdc6c40740f882d6edc38bd1714a597ff65bf064e (diff)
downloadcoredns-949b4534729bcd4512c996821ff32e6f0a5d6765.tar.gz
coredns-949b4534729bcd4512c996821ff32e6f0a5d6765.tar.zst
coredns-949b4534729bcd4512c996821ff32e6f0a5d6765.zip
Update Makefile for git get -u with version (#1372)
The changes in this fix have: 1. checkout master branch of dependencies (non-branch will trigger an error with go get -u) 2. go get -u 3. checkout specific versioon (not necessary a branch). Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
-rw-r--r--Makefile17
1 files changed, 11 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 57dd348af..0b01b0bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,17 @@ testk8s: check
.PHONY: godeps
godeps:
- go get github.com/mholt/caddy
- go get github.com/miekg/dns
- go get github.com/prometheus/client_golang/prometheus/promhttp
- go get github.com/prometheus/client_golang/prometheus
- go get golang.org/x/net/context
- go get golang.org/x/text
+ (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.10)
(cd $(GOPATH)/src/github.com/miekg/dns && git checkout -q v1.0.3)
(cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.8.0)