Skip to content

Commit d4ede0d

Browse files
committed
ci-tools: versions of golang
Add and update golang versions. Also fix install.tools target for installing govet Signed-off-by: Vincent Batts <[email protected]>
1 parent ad9d643 commit d4ede0d

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
language: go
22
go:
3-
- 1.6
4-
- 1.5.3
3+
- 1.7
4+
- 1.6.3
5+
- 1.5.4
56

67
sudo: required
78

Makefile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ ALLOWED_GO_VERSION = $(shell test '$(shell /bin/echo -e "$(1)\n$(2)" | sort -V |
6868

6969
test: .govet .golint .gitvalidation
7070

71-
# `go get golang.org/x/tools/cmd/vet`
7271
.govet:
73-
@go tool | grep -qw vet || (echo "ERROR: 'go vet' not found. Consider 'make install.tools' target" && false)
7472
go vet -x ./...
7573

7674
# `go get github.com/golang/lint/golint`
@@ -92,22 +90,16 @@ endif
9290

9391

9492
.PHONY: install.tools
95-
install.tools: .install.golint .install.govet .install.gitvalidation
93+
install.tools: .install.golint .install.gitvalidation
9694

9795
# golint does not even build for <go1.5
9896
.install.golint:
9997
ifeq ($(call ALLOWED_GO_VERSION,1.5,$(HOST_GOLANG_VERSION)),true)
100-
go get github.com/golang/lint/golint
101-
endif
102-
103-
# go vet is now included in >=go1.5, so no need to get it.
104-
.install.govet:
105-
ifeq ($(call ALLOWED_GO_VERSION,1.5,$(HOST_GOLANG_VERSION)),true)
106-
go get golang.org/x/tools/cmd/vet
98+
go get -u github.com/golang/lint/golint
10799
endif
108100

109101
.install.gitvalidation:
110-
go get github.com/vbatts/git-validation
102+
go get -u github.com/vbatts/git-validation
111103

112104

113105
.PHONY: clean

0 commit comments

Comments
 (0)