Skip to content

Commit 300eb00

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 300eb00

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

.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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
EPOCH_TEST_COMMIT := 78e6667ae2d67aad100b28ee9580b41b7a24e667
33
OUTPUT_DIRNAME ?= output/
44
DOC_FILENAME ?= oci-runtime-spec
5+
SHELL ?= $(shell command -v sh 2>/dev/null)
56
DOCKER ?= $(shell command -v docker 2>/dev/null)
67
PANDOC ?= $(shell command -v pandoc 2>/dev/null)
78
ifeq "$(strip $(PANDOC))" ''
@@ -97,17 +98,17 @@ install.tools: .install.golint .install.govet .install.gitvalidation
9798
# golint does not even build for <go1.5
9899
.install.golint:
99100
ifeq ($(call ALLOWED_GO_VERSION,1.5,$(HOST_GOLANG_VERSION)),true)
100-
go get github.com/golang/lint/golint
101+
go get -u github.com/golang/lint/golint
101102
endif
102103

103104
# go vet is now included in >=go1.5, so no need to get it.
104105
.install.govet:
105-
ifeq ($(call ALLOWED_GO_VERSION,1.5,$(HOST_GOLANG_VERSION)),true)
106-
go get golang.org/x/tools/cmd/vet
106+
ifneq ($(call ALLOWED_GO_VERSION,1.5,$(HOST_GOLANG_VERSION)),true)
107+
go get -u golang.org/x/tools/cmd/vet
107108
endif
108109

109110
.install.gitvalidation:
110-
go get github.com/vbatts/git-validation
111+
go get -u github.com/vbatts/git-validation
111112

112113

113114
.PHONY: clean

0 commit comments

Comments
 (0)