contrib: add sipa's github-merge script #3302

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2013_11_sipa_github_merge changing 3 files +215 −0

laanwj commented at 4:53 AM on November 22, 2013: member

Add @sipa's github-merge script, so that we have an easy way to sign all pull request merges and are more resilient against github or account compromises.
BitcoinPullTester commented at 5:09 AM on November 22, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/82d96b07b5c2f6b357925ae714f5636e63ce966f for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

in contrib/README.md:None in 82d96b07b5 outdated

  51 | @@ -52,3 +52,7 @@ tests each pull and when master is tested using jenkins.
  52 |  ### [Verify SF Binaries](/contrib/verifysfbinaries) ###
  53 |  This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge.
  54 |  
  55 | +### [Developer tools](/control/devtools) ###
  56 | +Specific tools for developers working on this repository.
  57 | +Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG.

sipa commented at 12:27 PM on November 22, 2013:

Adding the git calls to configure here for the bitcoin repository may make sense:

git config githubmerge.repository bitcoin/bitcoin
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
git config --global user.signingkey <key> (if you want to GPG sign)

laanwj commented at 12:56 PM on November 22, 2013:

Yes, good idea

sipa commented at 12:27 PM on November 22, 2013: member

ACK
contrib: add sipa's github-merge script e5adec35c6
laanwj referenced this in commit d4cda964d2 on Nov 24, 2013
laanwj merged this on Nov 24, 2013
laanwj closed this on Nov 24, 2013
laanwj deleted the branch on Apr 9, 2014
Bushstar referenced this in commit 87e54c80fe on Apr 8, 2020
Bushstar referenced this in commit da7686c936 on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

laanwj

BitcoinPullTester

sipa