Merge pull request #10 from rust-ops/checks-api

Add support for GitHub Checks

Author: alexcrichton

.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: python
 python:
-  - 3.3
   - 3.4
   - 3.5
 install:

README.md

@@ -107,7 +107,7 @@ the name of the repository you are configuring homu for.
    - Payload URL: `http://HOST:PORT/github`
    - Content type: `application/json`
    - Secret: The same as `repo.NAME.github.secret` in `cfg.toml`
-   - Events: `Issue Comment`, `Pull Request`, `Push`, `Status`
+   - Events: `Issue Comment`, `Pull Request`, `Push`, `Status`, `Check runs`
 
 6. Add a Webhook to your continuous integration service, if necessary. You don't
    need this if using Travis/Appveyor.

cfg.sample.toml

@@ -120,10 +120,10 @@ secret = ""
 #]
 
 # Travis integration. Don't forget to allow Travis to test the `auto` branch!
-[repo.NAME.status.travis]
-# String label set by status updates. Don't touch this unless you really know
-# what you're doing.
-context = 'continuous-integration/travis-ci/push'
+[repo.NAME.checks.travis]
+# Name of the Checks API run. Don't touch this unless you really know what
+# you're doing.
+name = "Travis CI - Branch"
 
 # Appveyor integration. Don't forget to allow Appveyor to test the `auto` branch!
 #[repo.NAME.status.appveyor]
@@ -144,6 +144,13 @@ context = 'continuous-integration/travis-ci/push'
 # only used if status_based_exemption is true.
 #pr_context = ""
 
+# Generic GitHub Checks API support. You don't need this if you're using the
+# above examples for Travis/Appveyor.
+#[repo.NAME.checks.LABEL]
+#
+# String name of the Checks run.
+#name = ""
+
 # Use buildbot for running tests
 #[repo.NAME.buildbot]
 #

homu/main.py

@@ -346,6 +346,7 @@ def start_testing(self, timeout):
         self.set_status('pending')
 
         wm = weakref.WeakMethod(self.timed_out)
+
         def timed_out():
             m = wm()
             if m:
@@ -874,12 +875,12 @@ def create_merge(state, repo_cfg, branch, logger, git_cfg,
         'You may also read'
         ' [*Git Rebasing to Resolve Conflicts* by Drew Blessing](http://blessing.io/git/git-rebase/open-source/2015/08/23/git-rebasing-to-resolve-conflicts.html)' # noqa
         ' for a short tutorial.\n\n'
-        'Please avoid the ["**Resolve conflicts**" button](https://help.github.com/articles/resolving-a-merge-conflict-on-github/) on GitHub.' #noqa
-        ' It uses `git merge` instead of `git rebase` which makes the PR commit'
+        'Please avoid the ["**Resolve conflicts**" button](https://help.github.com/articles/resolving-a-merge-conflict-on-github/) on GitHub.' # noqa
+        ' It uses `git merge` instead of `git rebase` which makes the PR commit' # noqa
         ' history more difficult to read.\n\n'
         'Sometimes step 4 will complete without asking for resolution. This is'
         ' usually due to difference between how `Cargo.lock` conflict is'
-        ' handled during merge and rebase. This is normal, and you should still'
+        ' handled during merge and rebase. This is normal, and you should still' # noqa
         ' perform step 5 to update this PR.\n\n'
         '</details>\n\n'
     ).format(branch=state.head_ref.split(':', 1)[1])
@@ -974,7 +975,7 @@ def create_merge(state, repo_cfg, branch, logger, git_cfg,
                         stderr=subprocess.STDOUT,
                         universal_newlines=True)
                 except subprocess.CalledProcessError as e:
-                    comment += '<details><summary>Error message</summary>\n\n```text\n'
+                    comment += '<details><summary>Error message</summary>\n\n```text\n' # noqa
                     comment += e.output
                     comment += '\n```\n\n</details>'
                     pass
@@ -1235,6 +1236,9 @@ def start_build(state, repo_cfgs, buildbot_slots, logger, db, git_cfg):
 
         if found_travis_context and len(builders) == 1:
             can_try_travis_exemption = True
+    if 'checks' in repo_cfg:
+        builders += ['checks-' + key for key, value in repo_cfg['checks'].items() if 'name' in value]  # noqa
+        only_status_builders = False
 
     if len(builders) is 0:
         raise RuntimeError('Invalid configuration')
@@ -1679,6 +1683,8 @@ def main():
                     builders += ['travis']
                 if 'status' in repo_cfg:
                     builders += ['status-' + key for key, value in repo_cfg['status'].items() if 'context' in value]  # noqa
+                if 'checks' in repo_cfg:
+                    builders += ['checks-' + key for key, value in repo_cfg['checks'].items() if 'name' in value]  # noqa
                 if len(builders) is 0:
                     raise RuntimeError('Invalid configuration')
 

homu/server.py

@@ -196,7 +196,10 @@ def callback():
         logger.warn('/callback encountered an error '
                     'during github oauth callback')
         # probably related to https://gitlab.com/pycqa/flake8/issues/42
-        lazy_debug(logger, lambda: 'github oauth callback err: {}'.format(ex))  # noqa
+        lazy_debug(
+            logger,
+            lambda ex=ex: 'github oauth callback err: {}'.format(ex),
+        )
         abort(502, 'Bad Gateway')
 
     args = urllib.parse.parse_qs(res.text)
@@ -514,6 +517,33 @@ def fail(err):
         report_build_res(info['state'] == 'success', info['target_url'],
                          'status-' + status_name, state, logger, repo_cfg)
 
+    elif event_type == 'check_run':
+        try:
+            state, repo_label = find_state(info['check_run']['head_sha'])
+        except ValueError:
+            return 'OK'
+
+        current_run_name = info['check_run']['name']
+        checks_name = None
+        if 'checks' in repo_cfg:
+            for name, value in repo_cfg['checks'].items():
+                if 'name' in value and value['name'] == current_run_name:
+                    checks_name = name
+        if checks_name is None:
+            return 'OK'
+
+        if info['check_run']['status'] != 'completed':
+            return 'OK'
+        if info['check_run']['conclusion'] is None:
+            return 'OK'
+
+        report_build_res(
+            info['check_run']['conclusion'] == 'success',
+            info['check_run']['details_url'],
+            'checks-' + checks_name,
+            state, logger, repo_cfg,
+        )
+
     return 'OK'
 
 
@@ -653,9 +683,10 @@ def buildbot():
                     except Exception as ex:
                         logger.warn('/buildbot encountered an error during '
                                     'github logs request')
-                        # probably related to
-                        # https://gitlab.com/pycqa/flake8/issues/42
-                        lazy_debug(logger, lambda: 'buildbot logs err: {}'.format(ex))  # noqa
+                        lazy_debug(
+                            logger,
+                            lambda ex=ex: 'buildbot logs err: {}'.format(ex),
+                        )
                         abort(502, 'Bad Gateway')
 
                     mat = INTERRUPTED_BY_HOMU_RE.search(res.text)