On Wed, Mar 30, 2016 at 10:57 AM, Aaron Meurer <[email protected]> wrote: > GitHub today announced a change to their protected branches feature > that allows to require status checks without requiring fast-forward > merges https://github.com/blog/2137-protected-branches-improvements. > Previously we had not enabled the feature that required Travis to pass > before merging because it also required fast-forward merges, which was > too restrictive (every pull request would have to be re-merged with > master and tested again). > > So I have enabled required Travis testing on SymPy master. This means > that no pull request can be merged unless Travis passes. > > The other benefit of this is that it's now impossible to accidentally > push to master. If you try, git will give you an error like > > $ git push > Counting objects: 1, done. > Writing objects: 100% (1/1), 186 bytes | 0 bytes/s, done. > Total 1 (delta 0), reused 0 (delta 0) > remote: error: GH006: Protected branch update failed for refs/heads/master. > remote: error: Required status check > "continuous-integration/travis-ci/push" is errored > To [email protected]:asmeurer/GitHub-Issues-Test.git > ! [remote rejected] master -> master (protected branch hook declined) > error: failed to push some refs to > '[email protected]:asmeurer/GitHub-Issues-Test.git' > > It's also impossible to edit files directly in master with the GitHub > editor, meaning accidental breakages like > https://github.com/sympy/sympy/pull/10902 are now impossible. > > I hope this policy isn't too restrictive. Please let me know if there > are any issues with it.
I like this. The only downside is that sometimes Travis fails (internal error) but we know that the PR change couldn't have triggered such a failure. Now we'll have to rerun the failed build. But I think that's fine. The advantages outweigh this minor annoyance. Ondrej -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/sympy. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CADDwiVBGdxNroOYXdPOOPXhkb4ZqwHS_aHs84a%3DujRGYYoUHqA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
