Check verify-commits on pushes to master #9656

pull TheBlueMatt wants to merge 2 commits into bitcoin:master from TheBlueMatt:2017-01-fix-verify-commits changing 2 files +5 −1

TheBlueMatt commented at 8:59 PM on January 31, 2017: member

After this, travis will check commits are properly signed, but only on pushes to bitcoin/bitcoin, not on PRs (obviously).
TheBlueMatt force-pushed on Jan 31, 2017
in contrib/verify-commits/trusted-keys:None in 9f5bac08d7 outdated
```
   1 | @@ -2,3 +2,4 @@
   2 |  3F1888C6DCA92A6499C4911FDBA1A67379A1A931
   3 |  32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
   4 |  FE09B823E6D83A3BC7983EAA2D7F2372E50FE137
   5 | +FE09B823E6D83A3BC7983EAA2D7F2372E50FE137
```
laanwj commented at 8:30 AM on February 1, 2017:

I know I can be number-blind sometimes, but isn't this the same as the entry above it?

jonasschnelli commented at 8:32 AM on February 1, 2017:

Yes. He already did this in April last year. https://github.com/bitcoin/bitcoin/pull/7921

in .travis.yml:None in 9f5bac08d7 outdated

  65 | @@ -66,6 +66,7 @@ script:
  66 |      - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
  67 |      - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi
  68 |      - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
  69 | +    - if [ "$RUN_TESTS" = "true" -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi

MarcoFalke commented at 11:08 AM on February 1, 2017:

The repo is flattened by distdir a few lines above, so this should not work here...

You may want to try to move it up to where it does the check-doc.py, maybe.

TheBlueMatt commented at 2:38 PM on February 1, 2017: member

Wow I managed to super confuse myself in testing here...fixed both issues.
TheBlueMatt force-pushed on Feb 1, 2017
TheBlueMatt renamed this:
~~Add Marko's Key to verify-commits and check verify-commits on pushes to master~~
Check verify-commits on pushes to master
on Feb 1, 2017
jonasschnelli added the label Scripts and tools on Feb 1, 2017

Require merge commits merge branches on top of other merge commits

Specifically, require that the left branch (first restult of git
show -s --format=format:%P) is a signed merge commit, instead of
allowing either. This is fine for now, but might need to be relaxed
in the future.

Also fixes an out-of-file-descriptors issue by holding too many
open FDs writing to /dev/null

3e900acafa

Test that pushes to bitcoin/bitcoin are signed per verify-commits ba94426d53

in .travis.yml:None in b558119590 outdated

  50 | @@ -51,6 +51,7 @@ before_script:
  51 |      - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
  52 |      - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
  53 |  script:
  54 | +    - if [ "$RUN_TESTS" = "true" -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi

MarcoFalke commented at 10:58 PM on February 1, 2017:

Are you sure this is working. I could imagine gpg needs the keys first. Something like

while read line; do travis_retry gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys $line; done < contrib/verify-commits/trusted-keys; fi

would do it, but it might not be enough. I tried to do this once but I gave up as it was too tricky to get right on travis...

TheBlueMatt force-pushed on Feb 1, 2017
TheBlueMatt commented at 11:23 PM on February 1, 2017: member

It appears I throughly confused myself trying to test, again, but you can see an equivalent version (patched to work on my repo) clearly passing at https://travis-ci.org/TheBlueMatt/bitcoin/jobs/197481158
MarcoFalke commented at 9:21 AM on February 2, 2017: member

utACK ba94426d531d45643e37567412c3f9d97f71ae5f
laanwj merged this on Feb 2, 2017
laanwj closed this on Feb 2, 2017
laanwj referenced this in commit 7c93952fec on Feb 2, 2017
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels