We recently moved our infrastructure to Travis CI in order to gain some flexibility (http://www.lars.com/servo/travis/2014/06/11/servo-travisci.html) and reduce our build time (clean builds have gone from hours to < 10 minutes!). This e-mail describes some of the temporary and longer-term changes to how we merge PRs.
Once people rebase their existing PRs on top of the Travis CI support in master, the PRs will automatically be tested. The status of a PR will be shown as green ball=passsed tests, orange ball=in progress, x=failed. These will appear next to the PR number on the Servo PRs page: https://github.com/mozilla/servo/pulls You can get additional details (or watch the log during the build and tests) by going to the Travis CI page for Servo: https://travis-ci.org/mozilla/servo/pull_requests In the short term, when a PR is green and master has not been updated, instead of our previous "r+" system, you may press the Merge Pull Request button. If the PR is green but master has changed since it was tested, please first go to the Travis CI page for Servo, find the corresponding build, and press the "Restart Build" button before merging to ensure that no conflicting changes have landed in master since the PR was tested. You can tell whether a PR was built against master by finding the hash for master from https://github.com/mozilla/servo/commits/master and comparing it against the one listed in the test merge commit for the PR at https://travis-ci.org/mozilla/servo/pull_requests. Don't stress too much if you mess this up; Travis will report to #servo if we landed something in master that fails a test and we can back it out. In the longer term, we will automate this process by rebuilding bors (We have the technology!) to perform the necessary check, possible rebuild, and the GitHub merge upon r+, as it previously did with our buildbot-based system. If you have any questions, please feel free to track down larsberg on #servo. Thanks, - Lars _______________________________________________ dev-servo mailing list dev-servo@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-servo
