houshengbo closed pull request #40: Fix the signature issue
URL: https://github.com/apache/incubator-openwhisk-release/pull/40
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/tools/install_dependencies.sh b/tools/install_dependencies.sh
index ca365bc..38a7c4f 100755
--- a/tools/install_dependencies.sh
+++ b/tools/install_dependencies.sh
@@ -16,8 +16,7 @@ elif [ $sysOS == "Linux" ];then
fi
if [ $DISTRO == "Ubuntu" ];then
echo "This is Ubuntu."
- sudo apt-get install jq
- sudo apt-get install gnupg
+ sudo apt-get install jq gnupg expect
fi
else
echo "Other OS: $sysOS. Please manually install jq library."
diff --git a/tools/sign_artifacts.sh b/tools/sign_artifacts.sh
index a4b0992..c43a166 100755
--- a/tools/sign_artifacts.sh
+++ b/tools/sign_artifacts.sh
@@ -40,8 +40,7 @@ for artifact in *.tar.gz; do
# The option --passphrase-fd does not work on Mac.
`gpg --yes --armor --output ${artifact}.asc --detach-sig ${artifact}`
elif [ $sysOS == "Linux" ];then
- echo "started to sign it"
- `echo $passphrase | gpg -c -q --passphrase-fd 0 --yes --armor --output
${artifact}.asc --detach-sig ${artifact}`
+ `echo $passphrase | gpg --passphrase-fd 0 --yes --armor --output
${artifact}.asc --detach-sig ${artifact}`
fi
done
diff --git a/tools/travis/import_pgp_key.sh b/tools/travis/import_pgp_key.sh
index 01e64e5..3211baf 100755
--- a/tools/travis/import_pgp_key.sh
+++ b/tools/travis/import_pgp_key.sh
@@ -14,4 +14,4 @@ gpg --import $PARENTDIR/key_pub.gpg
echo "Load the private key."
gpg --allow-secret-key-import --import $PARENTDIR/key_sec.gpg
-gpg --list-keys
+expect -c "spawn gpg --edit-key s...@us.ibm.com trust quit; send \"5\ry\r\";
expect eof"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
