Skip to content

Conversation

laanwj
Copy link
Member

@laanwj laanwj commented Nov 22, 2013

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
Copy link

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 (if you want to GPG sign)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good idea

@sipa
Copy link
Member

sipa commented Nov 22, 2013

ACK

laanwj added a commit that referenced this pull request Nov 24, 2013
e5adec3 contrib: add sipa's github-merge script (Wladimir J. van der Laan)
@laanwj laanwj merged commit e5adec3 into bitcoin:master Nov 24, 2013
@laanwj laanwj deleted the 2013_11_sipa_github_merge branch April 9, 2014 14:31
Bushstar pushed a commit to Bushstar/omnicore that referenced this pull request Apr 8, 2020
Bushstar pushed a commit to Bushstar/omnicore that referenced this pull request Apr 8, 2020
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants