From: Daniel Wagner <dwagner@suse.de>
Date: Mon, 18 Jul 2022 14:37:29 +0000 (+0200)
Subject: build: Update version before regenerating docs
X-Git-Tag: v2.1.1~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2f9891e3c0879c5ffe51dd91f1dff65046bddef5;p=users%2Fsagi%2Fnvme-cli.git

build: Update version before regenerating docs

The docs contain the version string. Let's set new version before
regenerating the documentation to keep it consistent.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/release.sh b/release.sh
index 578590d2..c124b5bb 100755
--- a/release.sh
+++ b/release.sh
@@ -54,16 +54,16 @@ else
     exit 1
 fi
 
-./$doc_dir/update-docs.sh
-git add $doc_dir
-git commit -s -m "Regenerate all documentation" \
-              -m "Regenerate documentation for $VERSION release"
-
 # update meson.build
 sed -i -e "0,/[ \t]version: /s/\([ \t]version: \).*/\1\'$ver\',/" meson.build
 git add meson.build
+git commit -s -m "build: Update version to $VERSION"
+
+# update documentation
+./$doc_dir/update-docs.sh
+git add $doc_dir
+git commit -s -m "doc: Regenerate all docs for $VERSION"
 
-git commit -s -m "Release $VERSION"
 git tag -s -m "Release $VERSION" "$VERSION"
 git push --dry-run origin "$VERSION"^{}:master tag "$VERSION"