upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-09 00:33:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Small Makefile and script cleanup (#5354)

Browse source
This commit is contained in:
Calvin Leung Huang 2018-09-18 14:28:37 -07:00 committed by Brian Kassouf
parent 5030139483
commit 60d4dac8a0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -92,7 +92,7 @@ vet:
# source files.
prep: fmtcheck
@sh -c "'$(CURDIR)/scripts/goversioncheck.sh' '$(GO_VERSION_MIN)'"
go generate $(go list ./... | grep -v /vendor/)
@go generate $(go list ./... | grep -v /vendor/)
@if [ -d .git/hooks ]; then cp .hooks/* .git/hooks/; fi
# bootstrap the build by downloading additional tools

3
scripts/goversioncheck.sh
View file

@ -5,7 +5,6 @@ echo "==> Checking that build is using go version >= $1..."
GO_VERSION=$(go version | grep -o 'go[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' | tr -d 'go')
IFS="." read -r -a GO_VERSION_ARR <<< "$GO_VERSION"
IFS="." read -r -a GO_VERSION_REQ <<< "$GO_VERSION_MIN"
@ -17,3 +16,5 @@ if [[ ${GO_VERSION_ARR[0]} -lt ${GO_VERSION_REQ[0]} ||
echo "Vault requires go $GO_VERSION_MIN to build; found $GO_VERSION."
exit 1
fi
echo "==> Using go version $GO_VERSION..."