| commit | 49bff07ec826180f5ab39de8727f193bcc280448 | [log] [tgz] |
|---|---|---|
| author | Jan Hruban <jan.hruban@gooddata.com> | Tue Nov 03 11:45:46 2015 +0100 |
| committer | Jesse Keating <omgjlk@us.ibm.com> | Mon May 08 21:14:34 2017 -0700 |
| tree | a5579c32b1a33c5bf6dcf6ea5a915051da5d4bd1 | |
| parent | e252a73a461916fb790e46acaf6362f7d938aca4 [diff] |
Merge pull requests from github reporter Github reporter can be configured to merge pull reqeusts. When there are multiple merges called at the same time, it leads to a situation when github returns 405 MethodNotAllowed error becuase github is checking the branch mergeability. When we encounter this situation, we try to wait a bit (2 seconds for now) and try to merge again. Pre-release version of Github3.py has to be used, because the latest released version 9.4 has a bug in merge method. Furthermore the newest merge method supports specifying exact sha to be merged, which is desirable to ensure that the exact commit that went through the pipeline gets merged. Both are already fixed in the stable branch, but not yet released on PyPi. See: https://github.com/sigmavirus24/github3.py/commit/90c6b7c2653d65ce686cf4346f9aea9cb9c5c836 https://github.com/sigmavirus24/github3.py/commit/6ef02cb33ff21257eeaf9cab186419ca45ef5806 Change-Id: I0c3abbcce476774a5ba8981c171382eaa4fe0abf