[riot-commits] [RIOT-OS/RIOT] b2f819: Travis: auto rebase on master before running

René Kijewski kijewski at mi.fu-berlin.de
Mon Aug 11 18:22:59 CEST 2014


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: b2f819b5da0424dadafe3efee56a11b4a140bc1b
      https://github.com/RIOT-OS/RIOT/commit/b2f819b5da0424dadafe3efee56a11b4a140bc1b
  Author: René Kijewski <rene.kijewski at fu-berlin.de>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Travis: auto rebase on master before running

It can happen that two PRs don't interfere with each other in the sense
that they hurt automatic rebasing, but still do not work together. The
prime example is PR1 changes the API of some function that PR2 uses. If
PR1 is merged, and PR2 is not rebased before merging, the error might
get unnoticed before the next build. Travis CI would have have told both
PR1 and PR2 are fine, but will complain (rather unnoticedly) that our
master does not compile.

This PR automatically rebases the PR on top of the current master,
before running the tests. If the automatic rebase fails, then this is
fine, because you will need to manually rebase again before merging,
anyway. The manual rebase, i.e. new push, will trigger Travis CI.

So, the main idea of this PR is that to can hit the "Restart Build"
button in Travis CI before hitting the merge button in Github.


  Commit: 3b7591f3bcc80b548f05fe3c7cc94bb29a8df87c
      https://github.com/RIOT-OS/RIOT/commit/3b7591f3bcc80b548f05fe3c7cc94bb29a8df87c
  Author: René Kijewski <kijewski at mi.fu-berlin.de>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #1526 from Kijewski/rebase-on-master

Travis: auto rebase on master before running


Compare: https://github.com/RIOT-OS/RIOT/compare/f67d209648ee...3b7591f3bcc8


More information about the commits mailing list