From 96dc5fd0d5abb9a6edbc66a03c34b72958c14bb1 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 1 Jun 2018 13:53:41 -0700
Subject: hack/release.sh: Bump spec in dev_version_commit
Bump it to the next version (without a -dev suffix), based on the
precedent set by 70672652 (Bump to v0.6.1-dev, 2018-05-25, #834).
Previously I had VERSION there, which was a copy/paste error.
I've also added an explicit write_spec_version to release_commit.
That *should* be a no-op, with the spec version having already been
set by the previous release's dev_version_commit. But better to be
safe than to cut a release with the wrong version number in the spec
file (e.g. maybe we guessed NEXT_VERSION wrong during the last
release).
Signed-off-by: W. Trevor King <wking@tremily.us>
Closes: #879
Approved by: mheon
---
hack/release.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'hack')
diff --git a/hack/release.sh b/hack/release.sh
index 986e2b58b..6a91c098c 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -45,6 +45,7 @@ write_changelog()
release_commit()
{
write_go_version "${VERSION}" &&
+ write_spec_version "${VERSION}" &&
write_changelog &&
git commit -asm "Bump to v${VERSION}"
}
@@ -52,7 +53,7 @@ release_commit()
dev_version_commit()
{
write_go_version "${NEXT_VERSION}-dev" &&
- write_spec_version "${VERSION}" &&
+ write_spec_version "${NEXT_VERSION}" &&
git commit -asm "Bump to v${NEXT_VERSION}-dev"
}
--
cgit v1.2.3-54-g00ecf