diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 1a2d0c0d..971fb7a9 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.13.0" + ".": "0.12.0" } diff --git a/Makefile b/Makefile index 7a1dbf22..2beef18e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ BINDIR ?= $(PREFIX)/bin BINARY = $(addprefix bin/,finch-daemon) PACKAGE := github.com/runfinch/finch-daemon -VERSION := $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags) +VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags) GITCOMMIT := $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) ifndef GODEBUG diff --git a/scripts/create-releases.sh b/scripts/create-releases.sh index 93c164d8..675d04eb 100755 --- a/scripts/create-releases.sh +++ b/scripts/create-releases.sh @@ -56,14 +56,15 @@ release_version=${1/v/} # Remove v from tag name dynamic_binary_name=finch-daemon-${release_version}-linux-${ARCH}.tar.gz static_binary_name=finch-daemon-${release_version}-linux-${ARCH}-static.tar.gz -make build +VERSION="$1" +make VERSION="$VERSION" build cp "$LICENSE_FILE" "${OUT_DIR}" pushd "$OUT_DIR" tar -czvf "$RELEASE_DIR"/"$dynamic_binary_name" -- * popd rm -rf "{$OUT_DIR:?}"/* -STATIC=1 make build +STATIC=1 make VERSION="$VERSION" build cp "$LICENSE_FILE" "${OUT_DIR}" pushd "$OUT_DIR" tar -czvf "$RELEASE_DIR"/"$static_binary_name" -- *