From ae097cfc62a2eb0823f3d637a4c08c800351e935 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 14 Apr 2024 19:24:32 +0200 Subject: [PATCH] Start using ~devel versions Same as systemd. While in development we suffix with ~devel. Also update the do-a-release script to add a second commit to switch back to ~devel when we do a release. We keep the old version in pyproject.toml because suffixing with ~devel conflicts with PEP 440 and python tools complain about that. --- mkosi/config.py | 2 +- tools/do-a-release.sh | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/mkosi/config.py b/mkosi/config.py index 7ef100789..09a1694c6 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -48,7 +48,7 @@ from mkosi.util import ( ) from mkosi.versioncomp import GenericVersion -__version__ = "22" +__version__ = "23~devel" ConfigParseCallback = Callable[[Optional[str], Optional[Any]], Any] ConfigMatchCallback = Callable[[str, Any], bool] diff --git a/tools/do-a-release.sh b/tools/do-a-release.sh index 6cf4c68e6..b4436d3c9 100755 --- a/tools/do-a-release.sh +++ b/tools/do-a-release.sh @@ -6,16 +6,26 @@ if [ -z "$1" ] ; then exit 1 fi +VERSION="$1" + if ! git diff-index --quiet HEAD; then echo "Repo has modified files." exit 1 fi -sed -r -i "s/^version = \".*\"$/version = \"$1\"/" pyproject.toml -sed -r -i "s/^__version__ = \".*\"$/__version__ = \"$1\"/" mkosi/config.py +sed -r -i "s/^version = \".*\"$/version = \"$VERSION\"/" pyproject.toml +sed -r -i "s/^__version__ = \".*\"$/__version__ = \"$VERSION\"/" mkosi/config.py git add -p pyproject.toml mkosi -git commit -m "Release $1" +git commit -m "Release $VERSION" + +git tag -s "v$VERSION" -m "mkosi $VERSION" + +VERSION="$((VERSION + 1))~devel" + +sed -r -i "s/^__version__ = \".*\"$/__version__ = \"$VERSION\"/" mkosi/config.py + +git add -p mkosi -git tag -s "v$1" -m "mkosi $1" +git commit -m "Bump version to $VERSION" -- 2.47.2