Remove go install from Makefile
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
parent
a921fb65ad
commit
cc9216c1dd
@ -23,7 +23,9 @@ before_build:
|
|||||||
- choco install codecov
|
- choco install codecov
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/bin:$PATH ; mingw32-make.exe setup check"
|
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/bin:$PATH;
|
||||||
|
script/setup/install-dev-tools;
|
||||||
|
mingw32-make.exe check"
|
||||||
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH ; mingw32-make.exe build binaries"
|
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH ; mingw32-make.exe build binaries"
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
|
@ -52,7 +52,7 @@ script:
|
|||||||
- export GOOS=$TRAVIS_GOOS
|
- export GOOS=$TRAVIS_GOOS
|
||||||
- export CGO_ENABLED=$TRAVIS_CGO_ENABLED
|
- export CGO_ENABLED=$TRAVIS_CGO_ENABLED
|
||||||
- GIT_CHECK_EXCLUDE="./vendor" TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" make dco
|
- GIT_CHECK_EXCLUDE="./vendor" TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" make dco
|
||||||
- GOOS=linux make setup
|
- GOOS=linux script/setup/install-dev-tools
|
||||||
- go build -i .
|
- go build -i .
|
||||||
- make check
|
- make check
|
||||||
- if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi
|
- if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi
|
||||||
|
9
Makefile
9
Makefile
@ -56,7 +56,7 @@ include Makefile.$(target_os)
|
|||||||
TESTFLAGS ?= -v $(TESTFLAGS_RACE)
|
TESTFLAGS ?= -v $(TESTFLAGS_RACE)
|
||||||
TESTFLAGS_PARALLEL ?= 8
|
TESTFLAGS_PARALLEL ?= 8
|
||||||
|
|
||||||
.PHONY: clean all AUTHORS fmt vet lint dco build binaries test integration setup generate protos checkprotos coverage ci check help install uninstall vendor release
|
.PHONY: clean all AUTHORS fmt vet lint dco build binaries test integration generate protos checkprotos coverage ci check help install uninstall vendor release
|
||||||
.DEFAULT: default
|
.DEFAULT: default
|
||||||
|
|
||||||
all: binaries
|
all: binaries
|
||||||
@ -70,13 +70,6 @@ ci: check binaries checkprotos coverage coverage-integration ## to be used by th
|
|||||||
AUTHORS: .mailmap .git/HEAD
|
AUTHORS: .mailmap .git/HEAD
|
||||||
git log --format='%aN <%aE>' | sort -fu > $@
|
git log --format='%aN <%aE>' | sort -fu > $@
|
||||||
|
|
||||||
setup: ## install dependencies
|
|
||||||
@echo "$(WHALE) $@"
|
|
||||||
# TODO(stevvooe): Install these from the vendor directory
|
|
||||||
@go get -u github.com/alecthomas/gometalinter
|
|
||||||
@gometalinter --install > /dev/null
|
|
||||||
@go get -u github.com/stevvooe/protobuild
|
|
||||||
|
|
||||||
generate: protos
|
generate: protos
|
||||||
@echo "$(WHALE) $@"
|
@echo "$(WHALE) $@"
|
||||||
@PATH=${ROOTDIR}/bin:${PATH} go generate -x ${PACKAGES}
|
@PATH=${ROOTDIR}/bin:${PATH} go generate -x ${PACKAGES}
|
||||||
|
10
script/setup/install-dev-tools
Executable file
10
script/setup/install-dev-tools
Executable file
@ -0,0 +1,10 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# Install developer tools to $GOBIN (or $GOPATH/bin if unset)
|
||||||
|
#
|
||||||
|
set -eu -o pipefail
|
||||||
|
|
||||||
|
go get -u github.com/stevvooe/protobuild
|
||||||
|
go get -u github.com/alecthomas/gometalinter
|
||||||
|
gometalinter --install >/dev/null
|
||||||
|
go get -u github.com/LK4D4/vndr
|
Loading…
Reference in New Issue
Block a user