Skip to content

Commit ccf8ee3

Browse files
authored
fixing version info (#115)
1 parent b018b2a commit ccf8ee3

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

hack/build-flags.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function build_flags() {
2121
if [[ -z "${version}" ]]; then
2222
# Get the commit, excluding any tags but keeping the "dirty" flag
2323
local commit="$(git describe --always --dirty --match '^$')"
24-
[[ -n "${commit}" ]] || abort "error getting the current commit"
24+
[[ -n "${commit}" ]] || (echo "error getting the current commit" && exit 1)
2525
version="v$(date +%Y%m%d)-local-${commit}"
2626
fi
2727

hack/release.sh

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,35 @@
1717
# Documentation about this script and how to use it can be found
1818
# at https://github.com/knative/hack
1919

20-
source $(dirname $0)/../vendor/knative.dev/hack/release.sh
21-
2220
PLUGIN="kn-quickstart"
21+
VERSION_PACKAGE="knative.dev/kn-plugin-quickstart/internal/command"
22+
23+
source $(dirname $0)/../vendor/knative.dev/hack/release.sh
24+
source $(dirname $0)/build-flags.sh
2325

2426
function build_release() {
27+
local ld_flags="$(build_flags $(dirname $0)/..)"
28+
local version="${TAG}"
29+
# Use vYYYYMMDD-<hash>-local for the version string, if not passed.
30+
[[ -z "${version}" ]] && version="v${BUILD_TAG}-local"
31+
2532
export GO111MODULE=on
2633
export CGO_ENABLED=0
2734
echo "🚧 🐧 Building for Linux (amd64)"
28-
GOOS=linux GOARCH=amd64 go build -mod=vendor -o ./${PLUGIN}-linux-amd64 ./cmd/...
35+
GOOS=linux GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./${PLUGIN}-linux-amd64 ./cmd/...
2936
echo "🚧 💪 Building for Linux (arm64)"
30-
GOOS=linux GOARCH=arm64 go build -mod=vendor -o ./${PLUGIN}-linux-arm64 ./cmd/...
37+
GOOS=linux GOARCH=arm64 go build -mod=vendor -ldflags "${ld_flags}" -o ./${PLUGIN}-linux-arm64 ./cmd/...
3138
echo "🚧 🍏 Building for macOS"
32-
GOOS=darwin GOARCH=amd64 go build -mod=vendor -o ./${PLUGIN}-darwin-amd64 ./cmd/...
39+
GOOS=darwin GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./${PLUGIN}-darwin-amd64 ./cmd/...
40+
echo "🚧 🍎 Building for macOS (arm64)"
41+
GOOS=darwin GOARCH=arm64 go build -mod=vendor -ldflags "${ld_flags}" -o ./${PLUGIN}-darwin-arm64 ./cmd/...
3342
echo "🚧 🎠 Building for Windows"
34-
GOOS=windows GOARCH=amd64 go build -mod=vendor -o ./${PLUGIN}-windows-amd64.exe ./cmd/...
43+
GOOS=windows GOARCH=amd64 go build -mod=vendor -ldflags "${ld_flags}" -o ./${PLUGIN}-windows-amd64.exe ./cmd/...
3544
echo "🚧 Z Building for Linux(s390x)"
36-
GOOS=linux GOARCH=s390x go build -mod=vendor -o ./${PLUGIN}-linux-s390x ./cmd/...
45+
GOOS=linux GOARCH=s390x go build -mod=vendor -ldflags "${ld_flags}" -o ./${PLUGIN}-linux-s390x ./cmd/...
3746
echo "🚧 P Building for Linux (ppc64le)"
38-
GOOS=linux GOARCH=ppc64le go build -mod=vendor -o ./${PLUGIN}-linux-ppc64le ./cmd/...
39-
ARTIFACTS_TO_PUBLISH="${PLUGIN}-darwin-amd64 ${PLUGIN}-linux-amd64 ${PLUGIN}-linux-arm64 ${PLUGIN}-windows-amd64.exe ${PLUGIN}-linux-s390x ${PLUGIN}-linux-ppc64le"
47+
GOOS=linux GOARCH=ppc64le go build -mod=vendor -ldflags "${ld_flags}" -o ./${PLUGIN}-linux-ppc64le ./cmd/...
48+
ARTIFACTS_TO_PUBLISH="${PLUGIN}-darwin-amd64 ${PLUGIN}-darwin-arm64 ${PLUGIN}-linux-amd64 ${PLUGIN}-linux-arm64 ${PLUGIN}-windows-amd64.exe ${PLUGIN}-linux-s390x ${PLUGIN}-linux-ppc64le"
4049
sha256sum ${ARTIFACTS_TO_PUBLISH} > checksums.txt
4150
ARTIFACTS_TO_PUBLISH="${ARTIFACTS_TO_PUBLISH} checksums.txt"
4251
echo "🧮 Checksum:"

0 commit comments

Comments
 (0)