Skip to content

Commit 05ab4c6

Browse files
committed
ref(Makefiles): install tools only from root
Instead of having several similar targets, this consolidates the installation of important go tools into the root Makefile.
1 parent 529b695 commit 05ab4c6

6 files changed

Lines changed: 12 additions & 45 deletions

File tree

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@ release: check-registry
7373

7474
deploy: build dev-release restart
7575

76+
setup-gotools:
77+
go get -u -v github.com/tools/godep
78+
go get -u -v github.com/golang/lint/golint
79+
go get -u -v golang.org/x/tools/cmd/cover
80+
go get -u -v golang.org/x/tools/cmd/vet
81+
82+
setup-root-gotools:
83+
# "go vet" and "go cover" must be installed as root on some systems
84+
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
85+
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
86+
sudo rm -rf /tmp/tmpGOPATH
87+
7688
test: test-style test-unit test-functional push test-integration
7789

7890
test-functional:

contrib/bumpver/Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@ upx:
77
clean:
88
rm -f bumpver
99

10-
setup-gotools-sudo:
11-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
12-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
13-
sudo rm -rf /tmp/tmpGOPATH
14-
@echo 'Please ensure that $$GOPATH/bin is in your $$PATH.'
15-
16-
setup-gotools:
17-
go get github.com/tools/godep
18-
go get github.com/golang/lint/golint
19-
@echo 'Please ensure that $$GOPATH/bin is in your $$PATH.'
20-
2110
test-style:
2211
go vet -x ./...
2312
-golint .

deisctl/Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@ installer:
3131
install:
3232
godep go install -v .
3333

34-
setup-root-gotools:
35-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
36-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
37-
sudo rm -rf /tmp/tmpGOPATH
38-
39-
setup-gotools:
40-
go get -u github.com/golang/lint/golint
41-
go get -u golang.org/x/tools/cmd/cover
42-
go get -u golang.org/x/tools/cmd/vet
43-
4434
test: test-style test-unit
4535

4636
test-style:

logger/Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ release:
5555

5656
deploy: build dev-release restart
5757

58-
setup-root-gotools:
59-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
60-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
61-
sudo rm -rf /tmp/tmpGOPATH
62-
63-
setup-gotools:
64-
go get -v github.com/golang/lint/golint
65-
6658
test: test-style test-unit test-functional
6759

6860
test-functional:

logspout/Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ release:
5555

5656
deploy: build dev-release restart
5757

58-
setup-root-gotools:
59-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
60-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
61-
sudo rm -rf /tmp/tmpGOPATH
62-
63-
setup-gotools:
64-
go get -v github.com/golang/lint/golint
65-
6658
test: test-style test-unit test-functional
6759

6860
test-functional:

tests/Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ test-full: test-style
2929
godep go test -tags integration -v -run TestReleases
3030
godep go test -tags integration -v -run TestUsers
3131

32-
setup-root-gotools:
33-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
34-
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
35-
sudo rm -rf /tmp/tmpGOPATH
36-
37-
setup-gotools:
38-
go get -v github.com/golang/lint/golint
39-
4032
mock-store:
4133
docker build -t $(MOCK_STORE_IMAGE) fixtures/mock-store/
4234

0 commit comments

Comments
 (0)