JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put -s and -w in the right spot (#3135)

Browse Source
This commit is contained in:
Matt Robinson 2019-09-27 09:38:02 -06:00 committed by Stefan Benten
parent 93349f247e
commit 02f68d68d6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -217,7 +217,7 @@ binary:
-e GOOS=${GOOS} -e GOARCH=${GOARCH} -e GOARM=6 -e CGO_ENABLED=1 \
-v /tmp/go-cache:/tmp/.cache/go-build -v /tmp/go-pkg:/go/pkg \
-w /go/src/storj.io/storj -e GOPROXY -u $(shell id -u):$(shell id -g) storjlabs/golang:${GO_VERSION} \
scripts/release.sh build -ldflags "-s -w" -o release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT} \
scripts/release.sh build -o release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT} \
storj.io/storj/cmd/${COMPONENT}
chmod 755 release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT}
[ "${FILEEXT}" = ".exe" ] && storj-sign release/${TAG}/$(COMPONENT)_${GOOS}_${GOARCH}${FILEEXT} || echo "Skipping signing"

2
scripts/release.sh
View File

@ -28,7 +28,7 @@ fi
echo Running "go $@"
exec go "$1" -ldflags \
"-X storj.io/storj/internal/version.buildTimestamp=$TIMESTAMP
"-s -w -X storj.io/storj/internal/version.buildTimestamp=$TIMESTAMP
-X storj.io/storj/internal/version.buildCommitHash=$COMMIT
-X storj.io/storj/internal/version.buildVersion=$VERSION
-X storj.io/storj/internal/version.buildRelease=$RELEASE" "${@:2}"