From 5f2dff86f32c8a8fff0d15b410d605a7af45ee12 Mon Sep 17 00:00:00 2001 From: Jerome Quere Date: Tue, 24 Mar 2020 22:13:04 +0100 Subject: [PATCH 1/4] chore: build script now generate SHA256 checksum file --- scripts/build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index ae6ce53378..3e94279b3b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,8 +1,6 @@ #!/bin/bash -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" -BIN_DIR="$ROOT_DIR/bin" +BIN_DIR="./bin" mkdir -p $BIN_DIR @@ -21,3 +19,9 @@ export CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DIR/scw-$VERSION-linux-x86_64" cmd/scw/main.go GOOS=darwin GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DIR/scw-$VERSION-darwin-x86_64" cmd/scw/main.go GOOS=windows GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DIR/scw-$VERSION-windows-x86_64.exe" cmd/scw/main.go + +shasum -a 256 \ + "$BIN_DIR/scw-$VERSION-linux-x86_64" \ + "$BIN_DIR/scw-$VERSION-darwin-x86_64" \ + "$BIN_DIR/scw-$VERSION-windows-x86_64.exe" \ + | sed -e 's#./bin/##' > "$BIN_DIR/SHA256SUMS" From 284102f12ff82179fbeaf84b74736d4e71279ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Bourgois?= Date: Wed, 25 Mar 2020 15:30:05 +0100 Subject: [PATCH 2/4] Update build.sh --- scripts/build.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 3e94279b3b..97262773f2 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,6 +1,10 @@ #!/bin/bash BIN_DIR="./bin" +VERSION=$(go run cmd/scw/main.go -o json version | jq -r .version | tr . -) +BIN_LINUX="$BIN_DIR/scw-$VERSION-linux-x86_64" +BIN_DARWIN="$BIN_DIR/scw-$VERSION-darwin-x86_64" +BIN_WINDOWS="$BIN_DIR/scw-$VERSION-windows-x86_64.exe" mkdir -p $BIN_DIR @@ -13,15 +17,14 @@ LDFLAGS=( -X main.BuildDate="$(date -u '+%Y-%m-%dT%I:%M:%S%p')" ) -VERSION=$(go run cmd/scw/main.go -o json version | jq -r .version | tr . -) export CGO_ENABLED=0 -GOOS=linux GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DIR/scw-$VERSION-linux-x86_64" cmd/scw/main.go -GOOS=darwin GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DIR/scw-$VERSION-darwin-x86_64" cmd/scw/main.go -GOOS=windows GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DIR/scw-$VERSION-windows-x86_64.exe" cmd/scw/main.go +GOOS=linux GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_LINUX" cmd/scw/main.go +GOOS=darwin GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DARWIN" cmd/scw/main.go +GOOS=windows GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_WINDOWS" cmd/scw/main.go shasum -a 256 \ - "$BIN_DIR/scw-$VERSION-linux-x86_64" \ - "$BIN_DIR/scw-$VERSION-darwin-x86_64" \ - "$BIN_DIR/scw-$VERSION-windows-x86_64.exe" \ + "$BIN_LINUX" \ + "$BIN_DARWIN" \ + "$BIN_WINDOWS" \ | sed -e 's#./bin/##' > "$BIN_DIR/SHA256SUMS" From faaf13a0d7523375b87d02f5a6448542b8b85a0e Mon Sep 17 00:00:00 2001 From: Jerome Quere Date: Wed, 25 Mar 2020 15:40:33 +0100 Subject: [PATCH 3/4] update --- scripts/build.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 08ff98fb9c..041718cabc 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,13 +1,6 @@ #!/bin/bash -BIN_DIR="./bin" -VERSION=$(go run cmd/scw/main.go -o json version | jq -r .version | tr . -) -BIN_LINUX="$BIN_DIR/scw-$VERSION-linux-x86_64" -BIN_DARWIN="$BIN_DIR/scw-$VERSION-darwin-x86_64" -BIN_WINDOWS="$BIN_DIR/scw-$VERSION-windows-x86_64.exe" - -mkdir -p $BIN_DIR - +export CGO_ENABLED=0 LDFLAGS=( -w -extldflags @@ -17,12 +10,19 @@ LDFLAGS=( -X main.BuildDate="$(date -u '+%Y-%m-%dT%I:%M:%S%p')" ) -export CGO_ENABLED=0 - +# If we are build from the dockerfile only build required binary if [[ "${BUILD_IN_DOCKER}" == "true" ]]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags "${LDFLAGS[*]}" ./cmd/scw exit 0 + +BIN_DIR="./bin" +VERSION=$(go run cmd/scw/main.go -o json version | jq -r .version | tr . -) +BIN_LINUX="$BIN_DIR/scw-$VERSION-linux-x86_64" +BIN_DARWIN="$BIN_DIR/scw-$VERSION-darwin-x86_64" +BIN_WINDOWS="$BIN_DIR/scw-$VERSION-windows-x86_64.exe" + +mkdir -p $BIN_DIR GOOS=linux GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_LINUX" cmd/scw/main.go GOOS=darwin GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DARWIN" cmd/scw/main.go GOOS=windows GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_WINDOWS" cmd/scw/main.go From eb404ae177ebd8f0ade58fb7c628ecf476b2d91f Mon Sep 17 00:00:00 2001 From: Jerome Quere Date: Wed, 25 Mar 2020 15:42:26 +0100 Subject: [PATCH 4/4] fix --- scripts/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build.sh b/scripts/build.sh index 041718cabc..0d6bc7b813 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,6 +14,7 @@ LDFLAGS=( if [[ "${BUILD_IN_DOCKER}" == "true" ]]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags "${LDFLAGS[*]}" ./cmd/scw exit 0 + fi BIN_DIR="./bin"