From 16edf3b01c9e87cff7ad5c0c19eee96e4bf84d50 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 18 Jul 2022 16:08:38 +0200 Subject: [PATCH] build: Update release version rules Include the release candidate version string into the project version. This allows to upload every release candidate to PyPI instead just the final release. Signed-off-by: Daniel Wagner --- release.sh | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/release.sh b/release.sh index 2199eac2..578590d2 100755 --- a/release.sh +++ b/release.sh @@ -9,10 +9,8 @@ usage() { echo " '^v[\d]+.[\d]+(-rc[0-9]+)?$'" echo "" echo "example:" - echo " release.sh v2.1-rc0 # v2.1 release candidate 0 -> sets the project " - echo " # version to '1.1' and sets the tag" - echo " release.sh v2.1-rc1 # v2.1 release canditate 1 -> only sets the tag" - echo " release.sh v2.1 # v2.1 release -> sets the final tag" + echo " release.sh v2.1-rc0 # v2.1 release candidate 0" + echo " release.sh v2.1 # v2.1 release" } VERSION=$1 @@ -22,14 +20,12 @@ if [ -z "$VERSION" ] ; then exit 1 fi -new_ver="" -rc="" +ver="" re='^v([0-9]+\.[0-9]+)(-rc[0-9]+)?$' if [[ "$VERSION" =~ $re ]]; then echo "Valid version $VERSION string" - new_ver=${BASH_REMATCH[1]} - rc=${BASH_REMATCH[2]} + ver=${BASH_REMATCH[1]}${BASH_REMATCH[2]} else echo "Invalid version string $VERSION" echo "" @@ -64,14 +60,8 @@ git commit -s -m "Regenerate all documentation" \ -m "Regenerate documentation for $VERSION release" # update meson.build -old_ver=$(sed -n "0,/[ \t]\+version: /s/[ \t]\+version: '\([0-9]\+.[0-9]\+\)',$/\1/p" meson.build) -if [ "$old_ver" != "$new_ver" ]; then - # Only update project version once, that is either - # - for the first RC phase or - # - for the release when there was no RC - sed -i -e "0,/[ \t]version: /s/\([ \t]version: \).*/\1\'$new_ver\',/" meson.build - git add meson.build -fi +sed -i -e "0,/[ \t]version: /s/\([ \t]version: \).*/\1\'$ver\',/" meson.build +git add meson.build git commit -s -m "Release $VERSION" git tag -s -m "Release $VERSION" "$VERSION" -- 2.50.1