This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-release.git
The following commit(s) were added to refs/heads/master by this push:
new 44303d3 Update js client rc config. (#322)
44303d3 is described below
commit 44303d3d6391a9b84bd8558c7663d88478cdd9ca
Author: rodric rabbah <[email protected]>
AuthorDate: Mon Feb 3 09:57:14 2020 -0500
Update js client rc config. (#322)
* Fix parameter name.
* New RC signed with Apache id.
* Add an optional key id for signing the RC.
---
docs/release_instructions.md | 5 ++++-
release-configs/client-js-3.21.0.config | 2 +-
tools/build_release.sh | 8 ++++----
tools/gen-release-vote.py | 2 +-
tools/sign_artifacts.sh | 7 ++++++-
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/docs/release_instructions.md b/docs/release_instructions.md
index 43218f7..08af448 100644
--- a/docs/release_instructions.md
+++ b/docs/release_instructions.md
@@ -123,9 +123,12 @@ Using ../stagingArea as scratch space, this script will
clone the
source repositories, package them into compressed tarballs, and create
the checksum and detached PGP signature files.
```
-./build_release.sh ../release-configs/<MY_RELEASE_CONFIG>.json
+./build_release.sh ../release-configs/<MY_RELEASE_CONFIG>.json
[<MY_APACHE_GPG_KEY_ID>]
```
+*Note:* `build_release.sh` uses your system default GPG key to sign the
release. To use an alternate key,
+specify the _key id_ as a second argument. Omit this value to use the default
key.
+
Next, verify the release artifacts by running
[local_verify.sh](../tools/local_verify.sh). This
script will run rcverify.sh against your local artifacts.
```
diff --git a/release-configs/client-js-3.21.0.config
b/release-configs/client-js-3.21.0.config
index 486a3ea..fbafba9 100644
--- a/release-configs/client-js-3.21.0.config
+++ b/release-configs/client-js-3.21.0.config
@@ -1,7 +1,7 @@
{
"versioning": {
"version": "3.21.0",
- "pre_release_version": "rc1"
+ "pre_release_version": "rc2"
},
"RepoList": [
"openwhisk-client-js"
diff --git a/tools/build_release.sh b/tools/build_release.sh
index 8f86124..f5b8360 100755
--- a/tools/build_release.sh
+++ b/tools/build_release.sh
@@ -22,7 +22,7 @@ SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)"
SCRIPTNAME=$(basename "$0")
if [ $# -lt 1 ]; then
- echo "Usage: $SCRIPTNAME <config-file>"
+ echo "Usage: $SCRIPTNAME <config-file> [gpg-key-id]"
exit -1
fi
@@ -31,6 +31,6 @@ if [ ! -f "$1" ]; then
exit -1
fi
-"$SCRIPTDIR"/download_source_code.sh $@
-"$SCRIPTDIR"/package_source_code.sh $@
-"$SCRIPTDIR"/sign_artifacts.sh $@
+"$SCRIPTDIR"/download_source_code.sh $1
+"$SCRIPTDIR"/package_source_code.sh $1
+"$SCRIPTDIR"/sign_artifacts.sh $1 $2
diff --git a/tools/gen-release-vote.py b/tools/gen-release-vote.py
index 36df52b..82fc95c 100755
--- a/tools/gen-release-vote.py
+++ b/tools/gen-release-vote.py
@@ -40,7 +40,7 @@ def parseArgsAndConfig():
parser.add_argument('-mc', '--mail-conf', help='YAML configuration file
for mailer', metavar='YAML', type=argparse.FileType('r'), required=False)
parser.add_argument('-s', '--subject', help='Component name for subject
line', metavar='NAME')
parser.add_argument('-i', '--signature', help='Signature line to conclude
email', metavar='SIGNATURE')
- parser.add_argument('rc-conf', help='JSON configuration file for release
candidate', metavar='release-config-file', type=argparse.FileType('r'))
+ parser.add_argument('rc_conf', help='JSON configuration file for release
candidate', metavar='release-config-file', type=argparse.FileType('r'))
if argcomplete:
argcomplete.autocomplete(parser)
diff --git a/tools/sign_artifacts.sh b/tools/sign_artifacts.sh
index 93914c0..f9fba96 100755
--- a/tools/sign_artifacts.sh
+++ b/tools/sign_artifacts.sh
@@ -23,6 +23,11 @@ echo "Sign the artifacts with PGP."
SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)"
source "$SCRIPTDIR/load_config.sh" "$1"
+if [ $# -eq 2 ]; then
+ echo "Using key id $2 to sign release."
+ PGP_SIGNING_KEY_ID="--default-key $2"
+fi
+
# Sign all the artifacts with the PGP key.
export GPG_TTY=$(tty)
sysOS=`uname -s`
@@ -36,7 +41,7 @@ echo "Sign the artifacts with the private key."
for artifact in *.tar.gz *.zip *.tgz; do
if [ "${artifact}" != "*.tar.gz" ] && [ "${artifact}" != "*.zip" ] && [
"${artifact}" != "*.tgz" ] ; then
gpg --print-md SHA512 ${artifact} > ${artifact}.sha512
- gpg --yes --armor --output ${artifact}.asc --detach-sig ${artifact}
+ gpg --yes --armor $PGP_SIGNING_KEY_ID --output ${artifact}.asc
--detach-sig ${artifact}
fi
done
