The branch, master has been updated
via 19fdc7f script/release.sh: generate announce.${tagname}.patch.txt
in announcement_samba_rc()
via d87077a script/release.sh: improve error messages if the tag
verification fails
from 6968ee4 script/autobuild.py: use --extra-python=/usr/bin/python3 by
default
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 19fdc7fd5785498044223874460f0ef13e88f576
Author: Karolin Seeger <[email protected]>
Date: Wed Jan 27 12:33:21 2016 +0100
script/release.sh: generate announce.${tagname}.patch.txt in
announcement_samba_rc()
This was only done in announcement_samba_stable() before.
Pair-Programmed-With: Stefan Metzmacher <[email protected]>
Signed-off-by: Karolin Seeger <[email protected]>
Signed-off-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Karolin Seeger <[email protected]>
Autobuild-Date(master): Mon Feb 15 17:41:49 CET 2016 on sn-devel-144
commit d87077afb41e3602443bbd79b1466f35e087e457
Author: Karolin Seeger <[email protected]>
Date: Wed Jan 27 12:29:44 2016 +0100
script/release.sh: improve error messages if the tag verification fails
This makes it more obvious if a gpg key is expired.
Pair-Programmed-With: Stefan Metzmacher <[email protected]>
Signed-off-by: Karolin Seeger <[email protected]>
Signed-off-by: Stefan Metzmacher <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
script/release.sh | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/script/release.sh b/script/release.sh
index e5d93a7..7db4e53 100755
--- a/script/release.sh
+++ b/script/release.sh
@@ -216,6 +216,8 @@ verify_samba_stable() {
git tag -v "${oldtagname}" >${verify_out} 2>&1 || {
echo "failed to verify old tag[${oldtagname}]"
+ echo ""
+ cat "${verify_out}"
return 1
}
@@ -411,7 +413,9 @@ check_nopatch() {
echo "Verifying tagname: ${tagname}"
git tag -v "${tagname}" >${verify_out} 2>&1 || {
- echo "failed to verify old tag[${oldtagname}]"
+ echo "failed to verify tag[${tagname}]"
+ echo ""
+ cat "${verify_out}"
return 1
}
grep -q "${GPG_KEYID}" "${verify_out}" || {
@@ -460,7 +464,9 @@ check_samba_stable() {
echo "Verifying tagname: ${tagname}"
git tag -v "${tagname}" >${verify_out} 2>&1 || {
- echo "failed to verify old tag[${oldtagname}]"
+ echo "failed to verify tag[${tagname}]"
+ echo ""
+ cat "${verify_out}"
return 1
}
grep -q "${GPG_KEYID}" "${verify_out}" || {
@@ -704,6 +710,40 @@ announcement_samba_rc() {
echo "<!-- END: ${bodyfile} -->"
} > announce.${tagname}.body.html
+ local webrepo="${TMPDIR}/webrepo"
+
+ mkdir "${webrepo}" || {
+ return 1
+ }
+ git -C "${webrepo}" init || {
+ return 1
+ }
+
+ mkdir -p "$(dirname ${webrepo}/${headlinefile})" || {
+ return 1
+ }
+ cp -a "announce.${tagname}.headline.html" "${webrepo}/${headlinefile}"
|| {
+ return 1
+ }
+
+ mkdir -p "$(dirname ${webrepo}/${bodyfile})" || {
+ return 1
+ }
+ cp -a "announce.${tagname}.body.html" "${webrepo}/${bodyfile}" || {
+ return 1
+ }
+
+ git -C "${webrepo}" add "${headlinefile}" "${bodyfile}" || {
+ return 1
+ }
+ git -C "${webrepo}" commit --signoff --message "NEWS[${version}]: Samba
${version} Available for Download" || {
+ return 1
+ }
+ CLEANUP_FILES="${CLEANUP_FILES} announce.${tagname}.patch.txt"
+ git -C "${webrepo}" format-patch --stdout -1 HEAD >
announce.${tagname}.patch.txt || {
+ return 1
+ }
+
CLEANUP_FILES="${CLEANUP_FILES} announce.${tagname}.todo.txt"
{
ls -lart announce.${tagname}.*
--
Samba Shared Repository
