diff mbox series

[1/4] release.sh: add signing and fix outdated commands

Message ID 20250110-update-release-v1-1-61e40b8ffbac@kernel.org (mailing list archive)
State Not Applicable, archived
Headers show
Series Update release.sh | expand

Commit Message

Andrey Albershteyn Jan. 10, 2025, 11:05 a.m. UTC
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
---
 release.sh | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

Comments

Darrick J. Wong Jan. 16, 2025, 9:43 p.m. UTC | #1
On Fri, Jan 10, 2025 at 12:05:06PM +0100, Andrey Albershteyn wrote:
> Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>

Looks reasonable to me!  (I like the conversion to long opts, btw)
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  release.sh | 29 ++++++++++++++++++++++++-----
>  1 file changed, 24 insertions(+), 5 deletions(-)
> 
> diff --git a/release.sh b/release.sh
> index 577257a354d442e1cc0a2b9381b11ffbe2f64a71..b15ed610082f34928827ab0547db944cf559cef4 100755
> --- a/release.sh
> +++ b/release.sh
> @@ -9,6 +9,8 @@
>  # configure.ac (with new version string)
>  # debian/changelog (with new release entry, only for release version)
>  
> +set -e
> +
>  . ./VERSION
>  
>  version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
> @@ -16,21 +18,38 @@ date=`date +"%-d %B %Y"`
>  
>  echo "Cleaning up"
>  make realclean
> +rm -rf "xfsprogs-${version}.tar" \
> +	"xfsprogs-${version}.tar.gz" \
> +	"xfsprogs-${version}.tar.asc" \
> +	"xfsprogs-${version}.tar.sign"
>  
>  echo "Updating CHANGES"
>  sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \
>  	mv doc/CHANGES.tmp doc/CHANGES
>  
>  echo "Commiting CHANGES update to git"
> -git commit -a -m "${version} release"
> +git commit --all --signoff --message="xfsprogs: Release v${version}
> +
> +Update all the necessary files for a v${version} release."
>  
>  echo "Tagging git repository"
> -git tag -a -m "${version} release" v${version}
> +git tag --annotate --sign --message="Release v${version}" v${version}
>  
>  echo "Making source tarball"
>  make dist
> +gunzip -k "xfsprogs-${version}.tar.gz"
>  
> -#echo "Sign the source tarball"
> -#gpg --detach-sign xfsprogs-${version}.tar.gz
> +echo "Sign the source tarball"
> +gpg \
> +	--detach-sign \
> +	--armor \
> +	"xfsprogs-${version}.tar"
>  
> -echo "Done.  Please remember to push out tags using \"git push --tags\""
> +echo "Verify signature"
> +gpg \
> +	--verify \
> +	"xfsprogs-${version}.tar.asc"
> +
> +mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign"
> +
> +echo "Done. Please remember to push out tags using \"git push origin v${version}\""
> 
> -- 
> 2.47.0
> 
>
diff mbox series

Patch

diff --git a/release.sh b/release.sh
index 577257a354d442e1cc0a2b9381b11ffbe2f64a71..b15ed610082f34928827ab0547db944cf559cef4 100755
--- a/release.sh
+++ b/release.sh
@@ -9,6 +9,8 @@ 
 # configure.ac (with new version string)
 # debian/changelog (with new release entry, only for release version)
 
+set -e
+
 . ./VERSION
 
 version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
@@ -16,21 +18,38 @@  date=`date +"%-d %B %Y"`
 
 echo "Cleaning up"
 make realclean
+rm -rf "xfsprogs-${version}.tar" \
+	"xfsprogs-${version}.tar.gz" \
+	"xfsprogs-${version}.tar.asc" \
+	"xfsprogs-${version}.tar.sign"
 
 echo "Updating CHANGES"
 sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \
 	mv doc/CHANGES.tmp doc/CHANGES
 
 echo "Commiting CHANGES update to git"
-git commit -a -m "${version} release"
+git commit --all --signoff --message="xfsprogs: Release v${version}
+
+Update all the necessary files for a v${version} release."
 
 echo "Tagging git repository"
-git tag -a -m "${version} release" v${version}
+git tag --annotate --sign --message="Release v${version}" v${version}
 
 echo "Making source tarball"
 make dist
+gunzip -k "xfsprogs-${version}.tar.gz"
 
-#echo "Sign the source tarball"
-#gpg --detach-sign xfsprogs-${version}.tar.gz
+echo "Sign the source tarball"
+gpg \
+	--detach-sign \
+	--armor \
+	"xfsprogs-${version}.tar"
 
-echo "Done.  Please remember to push out tags using \"git push --tags\""
+echo "Verify signature"
+gpg \
+	--verify \
+	"xfsprogs-${version}.tar.asc"
+
+mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign"
+
+echo "Done. Please remember to push out tags using \"git push origin v${version}\""