[dpdk-stable] [PATCH stable-scripts] Enable multiple release versions

[dpdk-stable] [PATCH stable-scripts] Enable multiple release versions

[Yongseok Koh]

Every time the script (4-final-review) is run, it will automatically increase
the RC version number (RTE_VER_RELEASE)

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
---
 4-final-review | 20 +++++++++++++++-----
 README         |  4 +++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/4-final-review b/4-final-review
index c61f63a..0c2a64e 100755
--- a/4-final-review
+++ b/4-final-review
@@ -4,15 +4,25 @@ source ./lib.sh
 
 assert_current_branch
 
+RTE_VER_RELEASE=$(awk '/#define RTE_VER_RELEASE/ { print $3 }' \
+	$DPDK_DIR/lib/librte_eal/common/include/rte_version.h)
+[ $RTE_VER_RELEASE -eq 16 ] && {
+	$RTE_VER_RELEASE=1
+} || {
+	let RTE_VER_RELEASE+=1
+}
+
+stable_release_rc="${stable_release}-rc${RTE_VER_RELEASE}"
+
 change_version()
 {
 	sed "s/#define RTE_VER_MINOR [0-9]*/#define RTE_VER_MINOR ${RTE_VER_MINOR}/" \
 		-i $DPDK_DIR/lib/librte_eal/common/include/rte_version.h
 	sed 's/#define RTE_VER_SUFFIX .*/#define RTE_VER_SUFFIX "-rc"/' \
 		-i $DPDK_DIR/lib/librte_eal/common/include/rte_version.h
-	sed "s/#define RTE_VER_RELEASE .*/#define RTE_VER_RELEASE 1/" \
+	sed "s/#define RTE_VER_RELEASE .*/#define RTE_VER_RELEASE ${RTE_VER_RELEASE}/" \
 		-i $DPDK_DIR/lib/librte_eal/common/include/rte_version.h
-	sed "s/Version: .*/Version: ${stable_release}-rc1/" -i $DPDK_DIR/pkg/dpdk.spec
+	sed "s/Version: .*/Version: ${stable_release_rc}/" -i $DPDK_DIR/pkg/dpdk.spec
 }
 
 do_commit()
@@ -20,13 +30,13 @@ do_commit()
 	# $GIT doesn't work, so cd
 
 	pushd $DPDK_DIR
-	git commit -a -s -m "version: ${stable_release}-rc1"
+	git commit -a -s -m "version: ${stable_release_rc}"
 	if [ "x$SIGN_TAG" == "xyes" ]; then
 		TAG_ARG="-s"
 	else
 		TAG_ARG=""
 	fi
-	git tag ${TAG_ARG} v${stable_release}-rc1 -a -m "dpdk-${stable_release}-rc1"
+	git tag ${TAG_ARG} v${stable_release_rc} -a -m "dpdk-${stable_release_rc}"
 	popd
 }
 
@@ -54,7 +64,7 @@ please run the tests and report any issue before the release date.
 
 A release candidate tarball can be found at:
 
-    https://dpdk.org/browse/dpdk-stable/tag/?id=v${stable_release}-rc1
+    https://dpdk.org/browse/dpdk-stable/tag/?id=v${stable_release_rc}
 
 These patches are located at branch $stable_branch of dpdk-stable repo:
     https://dpdk.org/browse/dpdk-stable/
diff --git a/README b/README
index 06f4be5..8d37403 100644
--- a/README
+++ b/README
@@ -87,7 +87,9 @@ that we are going to have following commits for a stable/LTS release.
 Do you have more comments, something like this commit should be removed,
 or something are missing, etc.
 
-This will also create a tag like v18.05.1-rc1 for you.
+This will also create a tag like v18.05.1-rc1 for you and each run of the
+script will increase the release version number by 1 starting from -rc1.
+
 Before sending this mail you might want to make a RC tarball available.
 To get that push the tag to the repository, hooks will generate a tarball.
 The generated link in the mail to the tag will not only show the tag,
-- 
2.11.0

Re: [dpdk-stable] [PATCH stable-scripts] Enable multiple release versions

[Luca Boccassi]

On Thu, 2018-08-23 at 16:02 -0700, Yongseok Koh wrote:
> Every time the script (4-final-review) is run, it will automatically
> increase
> the RC version number (RTE_VER_RELEASE)
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> ---
>  4-final-review | 20 +++++++++++++++-----
>  README         |  4 +++-
>  2 files changed, 18 insertions(+), 6 deletions(-)

Acked-by: Luca Boccassi <bluca@debian.org>

Thanks, pushed

-- 
Kind regards,
Luca Boccassi