houshengbo closed pull request #65: Change the email address for PGP key
generation
URL: https://github.com/apache/incubator-openwhisk-release/pull/65
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/.travis.yml b/.travis.yml
index a2d1ee2..b5baae4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ jobs:
before_install:
- if [ "$TRAVIS_PULL_REQUEST" == "false" ] ; then
- openssl aes-256-cbc -K $encrypted_e049e279fb54_key -iv
$encrypted_e049e279fb54_iv -in tools/key_sec.gpg.enc -out tools/key_sec.gpg -d;
+ openssl aes-256-cbc -K $encrypted_c52b332e1d8f_key -iv
$encrypted_c52b332e1d8f_iv -in tools/key_sec.gpg.enc -out tools/key_sec.gpg -d;
fi
after_failure:
diff --git a/tools/key_pub.gpg b/tools/key_pub.gpg
index 7f32dc5..7e5f630 100644
--- a/tools/key_pub.gpg
+++ b/tools/key_pub.gpg
@@ -1,30 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-mQINBFqi5Q0BEADcPVK9ephA0BXFHmUFApgj/3sTCUvDKYBXnu26+tSyH2R/DvcS
-Bl/4xLR8vEihR9CGh0Kfv8q/Wt7vV4TIYV3HVpFcMcQD2xg39mMtCCahbJqvj9go
-F1SRde7qW4Xgv39rqBA8KJzeGA6mruQaekAjo5kJ3dBp/PvI6MHWWvsJaAl+QiYT
-eKc1dTdcATvlT1BGzM8+r9yZBGvg02kvQAwg3acOj9lvUkgmKMNsujTKPqcEXhE6
-14g9DdQvaQ/qSF1E5sGwtz/ezjmNUK4vgfJqvlmyaJAvY7UB2tJn9uwKQHDS71NC
-/M9wEPm/4lbs5rShkYxuIcyg062gopLA6lBWpqhy221VPYCdQZ8Zb9MVBiJ60MtO
-J1ovB0gkCOS6V6MyZGxQrzUMjDCssbOGBmPoH95G6xCoTgFcsWWK9NLn3imX9/TM
-TtYU1vtvRceejjd0Vwq4WP5BjqQC4G3IgP34F0NUnEo/QptmzcyHatWrFbRUtWIl
-UiZp3l5Dl7DAz3KhZxdUh8AQ/j6XSYTUg6NiL3SCEkeWqxTWJlciMMILxkVFIgFo
-/SC5qCIqQ7nHfm3Yxgrl2lsCFWsChvOZEvvRi3ZLd695Vt52AySuXIwwzOhaAGWy
-sf4K6VZzn97mva1o+B+jQzYW60Wj6qaVooQUV4lyePh3zfCSOUd0tcG+TQARAQAB
-tE9PcGVuV2hpc2sgUmVsZWFzZSBCb3QgKFJlbGVhc2Ugb2YgT3BlbldoaXNrKSA8
-b3BlbndoaXNrLXJlbGVhc2UtYm90QGFwYWNoZS5vcmc+iQJOBBMBCAA4FiEEH7AP
-fb6yhiRAGRaFsneaH1Cww1IFAlqi5Q0CGy8FCwkIBwIGFQoJCAsCBBYCAwECHgEC
-F4AACgkQsneaH1Cww1Kz6A//UKguW3ZWRNKjym4L1fE7Csc2P2iiUWPYFw2QT0B4
-uRQkKjbEVsRw1GJKzfOKOu5LLeIoFnXdisaiDx55J0nVwDhxNJpnPUD0U8Ls2xqo
-LSWedwMu4WFftNJ0TAD3YlUTuPjuy1RT2/hZUclTiTGcbWIkYQUOk0G9DiIEw5PJ
-EMk/kcYflHBqEmUJhnVWTfkEByJh8Bd1NqpT5OVn9XWOVWcfJaZ4IGp7o9epD2Hr
-i24FMqi8CxFojMJwyIq4HcLt8pxvbENaROcYMc+xx53rSH6IccsvNiEekUBA2TSa
-07kxChEWOeichJ6/PXby3wcZg/wNOJJ76McfI5UVocxrQ+UXAb+AXpBJFGel0xL5
-xqQP9bE5hivroSJViITJiTf6m93wlZJRNVvlppARxBeO0txfi1EojJ7sgpC3jsP5
-xuWV5tqePQBPe3i7zqOb0xScMYnE+RAoj16TqIqpOR+tFb809Fxpm2kss6g+HZUX
-Fd3x7to2UTOckg+9jpe7R0VI8aIwuDOhLvhD11FTrJcglSNMbETMO1cTq+CEu6q2
-zXAJrBX62kcexzxm24oIySHcuc7nQpRx8iQBYdMPh/3u0lggLBAem/sJZ1fBoaO1
-Uhko3g9wSleM2twjWZMDOOlNPJVBd1Ajko+Gv16YUm80gBvKIylVQrrcH6VJCb5K
-hig=
-=c0uh
+mQINBFqqe6gBEACynVI07gX5+YKysUd7gpMiURbatu/Mo4yxOgBl3yOl8VL2nqMh
+ocwvD+9908l6aJX4KJxyabga4xa1VyOIifoOl37pTtghQhkJ/Pgsl23ixbe4ksJ4
+GyN08rFKcVKP0O2nuTJ/B0JhesHXScdAvqcYquTVcjEaP71OIpth2ahhXARbFBW5
+IVf3p8YWh65ruAf23prRL8EkOOWvGBKEd4SVO7IHB5BrS3pkKB88cuAWEm2L7TtD
+wkYtfJlAYU9+T7B74GOEikVPDV2s9GGU5PIP/5EtvFhJPnJ9P3WWIcecwqLbxoke
+77xc7qAlZfJv+XILCJaCr/0Lvl6o3GBV8E9JC+3YVw64BkKRbncJoY3bcnQODqPX
+c5NNSxnbNgnE3BuLvAFp2EE19mGOjixyI+EGiolKqBrQikAj4QfyzBPWKbvDEg24
+iCGNHq/aJ+rKA8nTDPdDHMW6V41MZompzVqFHkBM87tOiPkncTUxkOYY/lg5mAMO
+2aNaziBQ9Ztkyb+P11zvbPbnO4yZXycd7doGCw5VrOX6BPvaupGE4wpnljR5jeBj
+TLDzguROm6GgLUgKHUExkLIPzSF2ym+85tkoDX3AxvzrNKNe/lAELsjPQCgd8kaT
+9fFy6Eki8SwXpbSWjrxY/bS1EuJr09qiGDE2SQBi9ZU4PYMj/hgJl+/kQwARAQAB
+tEhPcGVuV2hpc2sgUmVsZWFzZSBCb3QgKFJlbGVhc2Ugb2YgT3BlbldoaXNrKSA8
+YXBhY2hlb3BlbndoaXNrQGdtYWlsLmNvbT6JAk4EEwEIADgWIQR9nnyysYlleTia
+UTpAXB0oIswgzAUCWqp7qAIbLwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBA
+XB0oIswgzBXQEACvIDl5Smo6eqTO7A864dt3cvlFtYVwwU+HM1gml0YdPN2JJsoP
+jqS7OuR/4fqPQTHrOOe79XVLzvwgbcrVQ+bjYaQvP5LW8AgP71T59aSyi8hVZNWA
+EExjkrazkhBWaRHciNzqXnAj1OfS9hLKBgbvFygek6psx8ZuBNMkQPLy41icAYr7
+dQExgRzU3dRSfhHJ3ldo6zMH+VvYk9bGOsvNXXFYtck44nKdtfbbq7LDc4reqI0w
+GIOn//1X5g2b0Kd5L22Zg3QODLnXiYCLwz+LymjTLZsD7DmoG2D/ZrF+IwMnmezi
+lPFePCm7Qj5kcyywO70lrCNZ6CRXtxB6aaKZS3Sn7UZDOO5oNHaTCp8Fp33R94P7
+gYgsecDXihIlL/i8lWYYSdOg8dnaJg8eoc7HM2j3iKdGIpNRDUBnLo+ukGU4dx+o
+Vr2pbtZWKYoS6WtlxQNDSr/8Sfvr0omWHGYHXn+OeK6qAgO9SO+rRB6y8HkR8BGD
+qCAHRLjLuzuyrCklbLXenLRHAqPK28IocsLUO80dSAygDf+uoSNQNN4WSNcnWkKS
+NVv/+gq5ygAG9hKdNl9HY4/Lyf1hBVdDsF08sc7cqMAE7snLVcgf3qH0lcL2n3vV
+tPLJty1GIgtcxFVMpCcx8oDovUtPkt/v0nni4OKwAP/kfnzXCLJAWS4ygw==
+=NVBb
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/tools/key_sec.gpg.enc b/tools/key_sec.gpg.enc
index 36b8c92..2f19c56 100644
Binary files a/tools/key_sec.gpg.enc and b/tools/key_sec.gpg.enc differ
diff --git a/tools/pgp_key_gen.conf b/tools/pgp_key_gen.conf
index a9b152d..4f1b8d2 100644
--- a/tools/pgp_key_gen.conf
+++ b/tools/pgp_key_gen.conf
@@ -3,7 +3,7 @@ Key-Type: RSA
Key-Length: 4096
Name-Real: OpenWhisk Release Bot
Name-Comment: Release of OpenWhisk
-Name-Email: [email protected]
+Name-Email: [email protected]
Expire-Date: 0
Passphrase: openwhisk
%commit
diff --git a/tools/travis/import_pgp_key.sh b/tools/travis/import_pgp_key.sh
index 6a87176..6183156 100755
--- a/tools/travis/import_pgp_key.sh
+++ b/tools/travis/import_pgp_key.sh
@@ -30,4 +30,4 @@ gpg --import $PARENTDIR/key_pub.gpg
echo "Load the private key."
gpg --allow-secret-key-import --import $PARENTDIR/key_sec.gpg
-expect -c "spawn gpg --edit-key [email protected] trust quit;
send \"5\ry\r\"; expect eof"
+expect -c "spawn gpg --edit-key [email protected] 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:
[email protected]
With regards,
Apache Git Services
