Skip to content

Commit cc9216c

Browse files
dnephindnephin
committed
Remove go install from Makefile
Signed-off-by: Daniel Nephin <[email protected]>
1 parent a921fb6 commit cc9216c

4 files changed

Lines changed: 15 additions & 10 deletions

File tree

‎.appveyor.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ before_build:
2323
- choco install codecov
2424

2525
build_script:
26-
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/bin:$PATH ; mingw32-make.exe setup check"
26+
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/bin:$PATH;
27+
script/setup/install-dev-tools;
28+
mingw32-make.exe check"
2729
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH ; mingw32-make.exe build binaries"
2830

2931
test_script:

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ script:
5252
- export GOOS=$TRAVIS_GOOS
5353
- export CGO_ENABLED=$TRAVIS_CGO_ENABLED
5454
- GIT_CHECK_EXCLUDE="./vendor" TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" make dco
55-
- GOOS=linux make setup
55+
- GOOS=linux script/setup/install-dev-tools
5656
- go build -i .
5757
- make check
5858
- if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi

‎Makefile‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ include Makefile.$(target_os)
5656
TESTFLAGS ?= -v $(TESTFLAGS_RACE)
5757
TESTFLAGS_PARALLEL ?= 8
5858

59-
.PHONY: clean all AUTHORS fmt vet lint dco build binaries test integration setup generate protos checkprotos coverage ci check help install uninstall vendor release
59+
.PHONY: clean all AUTHORS fmt vet lint dco build binaries test integration generate protos checkprotos coverage ci check help install uninstall vendor release
6060
.DEFAULT: default
6161

6262
all: binaries
@@ -70,13 +70,6 @@ ci: check binaries checkprotos coverage coverage-integration ## to be used by th
7070
AUTHORS: .mailmap .git/HEAD
7171
git log --format='%aN <%aE>' | sort -fu > $@
7272

73-
setup: ## install dependencies
74-
@echo "$(WHALE) $@"
75-
# TODO(stevvooe): Install these from the vendor directory
76-
@go get -u github.com/alecthomas/gometalinter
77-
@gometalinter --install > /dev/null
78-
@go get -u github.com/stevvooe/protobuild
79-
8073
generate: protos
8174
@echo "$(WHALE) $@"
8275
@PATH=${ROOTDIR}/bin:${PATH} go generate -x ${PACKAGES}

‎script/setup/install-dev-tools‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Install developer tools to $GOBIN (or $GOPATH/bin if unset)
4+
#
5+
set -eu -o pipefail
6+
7+
go get -u github.com/stevvooe/protobuild
8+
go get -u github.com/alecthomas/gometalinter
9+
gometalinter --install >/dev/null
10+
go get -u github.com/LK4D4/vndr

0 commit comments

Comments
 (0)