MarkAHershberger has submitted this change and it was merged.
Change subject: option to skip gpg signature (--dont-sign)
......................................................................
option to skip gpg signature (--dont-sign)
For testing purpose, we might want to skip signing entirely. For example
when we dont have our GPG key on the developement computer.
--dont-sign will skip gpg entirely.
Change-Id: I8b3ae792add749f9726a15745dd5d1d2c1829910
---
M make-release/make-release.py
1 file changed, 12 insertions(+), 6 deletions(-)
Approvals:
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 5db29b6..912dffc 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -158,6 +158,11 @@
'/usr/local/share/make-release)'
)
parser.add_argument(
+ '--dont-sign', dest='sign', action='store_false',
+ default=True,
+ help='skip gpg signing'
+ )
+ parser.add_argument(
'--tar-command', dest='tar_command',
default='tar',
help='path to tar, we are expecting a GNU tar. (defaults to tar)'
@@ -478,13 +483,14 @@
# Sign
uploadFiles = []
for fileName in outFiles:
- proc = subprocess.Popen([
- 'gpg', '--detach-sign', dir + '/' + fileName])
- if proc.wait() != 0:
- print "gpg failed, exiting"
- sys.exit(1)
+ if options.sign:
+ proc = subprocess.Popen([
+ 'gpg', '--detach-sign', dir + '/' + fileName])
+ if proc.wait() != 0:
+ print "gpg failed, exiting"
+ sys.exit(1)
+ uploadFiles.append(dir + '/' + fileName + '.sig')
uploadFiles.append(dir + '/' + fileName)
- uploadFiles.append(dir + '/' + fileName + '.sig')
# Generate upload tarball
tar = self.options.tar_command
--
To view, visit https://gerrit.wikimedia.org/r/86275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b3ae792add749f9726a15745dd5d1d2c1829910
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
