Skip to content

Commit aa1169a

Browse files
authored
vet: remove support for non-module-aware Go versions (#4530)
1 parent b1418a6 commit aa1169a

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

vet.sh

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,14 @@ PATH="${HOME}/go/bin:${GOROOT}/bin:${PATH}"
3232
go version
3333

3434
if [[ "$1" = "-install" ]]; then
35-
# Check for module support
36-
if go help mod >& /dev/null; then
37-
# Install the pinned versions as defined in module tools.
38-
pushd ./test/tools
39-
go install \
40-
golang.org/x/lint/golint \
41-
golang.org/x/tools/cmd/goimports \
42-
honnef.co/go/tools/cmd/staticcheck \
43-
github.com/client9/misspell/cmd/misspell
44-
popd
45-
else
46-
# Ye olde `go get` incantation.
47-
# Note: this gets the latest version of all tools (vs. the pinned versions
48-
# with Go modules).
49-
go get -u \
50-
golang.org/x/lint/golint \
51-
golang.org/x/tools/cmd/goimports \
52-
honnef.co/go/tools/cmd/staticcheck \
53-
github.com/client9/misspell/cmd/misspell
54-
fi
35+
# Install the pinned versions as defined in module tools.
36+
pushd ./test/tools
37+
go install \
38+
golang.org/x/lint/golint \
39+
golang.org/x/tools/cmd/goimports \
40+
honnef.co/go/tools/cmd/staticcheck \
41+
github.com/client9/misspell/cmd/misspell
42+
popd
5543
if [[ -z "${VET_SKIP_PROTO}" ]]; then
5644
if [[ "${TRAVIS}" = "true" ]]; then
5745
PROTOBUF_VERSION=3.14.0

0 commit comments

Comments
 (0)