Travis and "rebase before commit"
Sterling P. Smith
smithsp at fusion.gat.com
Thu Jun 22 06:14:52 UTC 2017
The simple solution is to allow the "Rebase" option in GitHub.
----- Original Message -----
> From: "Mojca Miklavec" <mojca at macports.org>
> To: "Zero King" <l2dy at macports.org>
> Cc: "MacPorts Development" <macports-dev at lists.macports.org>
> Sent: Wednesday, June 21, 2017 10:57:32 PM
> Subject: Travis and "rebase before commit"
> I'm so super grateful that we now have a working Travis setup :)
> As I suspected, there would be "problems" that we wouldn't be able to
> discover on a test setup and this is one of them.
> It's not really important to fix, but I wanted to mention it.
> What I do now for each PR is a totally cumbersome procedure:
> git fetch git://github.com/$GH_USER/macports-ports.git $GH_REMOTEBR
> git checkout -b $GH_LOCALBR FETCH_HEAD
> git rebase master
> git push -f git://github.com/$GH_USER/macports-ports.git
> git push origin $GH_LOCALBR:master
> The problem is that I would force push to the PR branch seconds or
> subseconds before pushing to the master branch to make the PR look
> merged rather than closed.
> Now this is a problem for Travis: it will "helpfully" try to build the
> PR again which neither does any good to us (harmless, but useless) nor
> succeeds if the push to master happens fast enogh.
> I cannot think of a good workaround for that though, except if Travis
> detects that the PR has already been deleted and won't report a
> failure, but that won't be any more useful either.
> I wouldn't worry about this too much, but I wanted to mention it.
More information about the macports-dev