status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-23 02:48:19 +00:00
Code Issues Projects Releases Wiki Activity

Fixes up some stale BUILD_TAGS references in the scripts.

Browse Source
This commit is contained in:
James Phillips 2017-03-23 22:52:39 -07:00
parent 15e7247131
commit 098da8eb49
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build.sh
View File

@ -43,7 +43,7 @@ echo "==> Building..."
-osarch="!darwin/arm" \ -osarch="!darwin/arm" \
-ldflags "-X ${GIT_IMPORT}.GitCommit='${GIT_COMMIT}${GIT_DIRTY}' -X ${GIT_IMPORT}.GitDescribe='${GIT_DESCRIBE}'" \ -ldflags "-X ${GIT_IMPORT}.GitCommit='${GIT_COMMIT}${GIT_DIRTY}' -X ${GIT_IMPORT}.GitDescribe='${GIT_DESCRIBE}'" \
-output "pkg/{{.OS}}_{{.Arch}}/consul" \ -output "pkg/{{.OS}}_{{.Arch}}/consul" \
-tags="${BUILD_TAGS}" \ -tags="${GOTAGS}" \
. .
# Move all the compiled things to the $GOPATH/bin # Move all the compiled things to the $GOPATH/bin

4
scripts/dist.sh
View File

@ -5,7 +5,7 @@ set -e
# We process the files in the same order Go does to find the last matching tag. # We process the files in the same order Go does to find the last matching tag.
if [ -z $VERSION ]; then if [ -z $VERSION ]; then
for file in $(ls version/version_*.go | sort); do for file in $(ls version/version_*.go | sort); do
for tag in "$BUILD_TAGS"; do for tag in "$GOTAGS"; do
if grep -q "// +build $tag" $file; then if grep -q "// +build $tag" $file; then
VERSION=$(awk -F\" '/Version =/ { print $2; exit }' <$file) VERSION=$(awk -F\" '/Version =/ { print $2; exit }' <$file)
fi fi
@ -36,7 +36,7 @@ fi
# Do a hermetic build inside a Docker container. # Do a hermetic build inside a Docker container.
if [ -z $NOBUILD ]; then if [ -z $NOBUILD ]; then
docker build -t hashicorp/consul-builder scripts/consul-builder/ docker build -t hashicorp/consul-builder scripts/consul-builder/
docker run --rm -e "BUILD_TAGS=$BUILD_TAGS" -v "$(pwd)":/gopath/src/github.com/hashicorp/consul hashicorp/consul-builder ./scripts/dist_build.sh docker run --rm -e "GOTAGS=$GOTAGS" -v "$(pwd)":/gopath/src/github.com/hashicorp/consul hashicorp/consul-builder ./scripts/dist_build.sh
fi fi
# Zip all the files. # Zip all the files.