search

SnapInteractive / mergeatron

A Node.JS bot that automatically runs Jenkins builds for new, and updated, GitHub Pull Requests.
http://snapinteractive.github.com/mergeatron
Apache License 2.0
27 stars 17 forks source link

Jenkins Tweaks - Closes #24 and #23 #25

Closed gnarf closed 11 years ago

gnarf commented 11 years ago

Just a suggestion for dealing with the merge part of jenkins bash script better.

mikesherov commented 11 years ago

@gnarf37 just post here when you can verify this is working as expected.

gnarf commented 11 years ago

I just used it to build a build from jQuery so, seems to work correctly!

mikesherov commented 11 years ago

So, this now assumes origin is "upstream". In a perfect world, that'd be configurable also.

gnarf commented 11 years ago

Well origin will be whatever url you put in jenkins, presumably the URL that people are issuing pulls to right? :)

gnarf commented 11 years ago

jquery/jquery#1041 btw - http://swarm.jquery.org:8080/job/Mergeatron%20jQuery/22/console

mikesherov commented 11 years ago

@steves, in these changes, @gnarf37 is assuming "upstream" is now origin, and "mergeatron" is origin. This brings a bit of clarity in the case where you clone "upstream" directly, which seems to make a little more sense. However, this can be tweaked to use upstream and origin if you'd prefer that.

Merge at will.

gnarf commented 11 years ago

The assumption being when you setup the job in jenkins the "base" git URL will become the "origin" remote. The one that mergeatron manipulates becomes "mergeatron" - makes more sense to me, also seems shorter/more direct.

gnarf commented 11 years ago

Oh - and also, it doesn't pollute local branches either, it does all its merge work in a headless state.