[Bf-committers] Making test builds for WIP projects.

[Bastien Montagne]

Think this would not be a good idea, since all branch would make a 
separate build on buildbot (we do not want to store tenth different 
builds/arch archives there…).

And yes, merge master + commit diff + revert worked fine for Dalai, so 
guess it’s the way to go. :)

Le 29/07/2014 09:31, Alex Fraser a écrit :
> Would it be possible to select an arbitrary branch on the builder page
> instead of only `master` or `testbuild`? Or, can you enter any git ref
> in the Revision text box? Then you wouldn't need to merge or revert
> anything.
>
> Cheers,
> Alex
>
> On Tue, Jul 29, 2014 at 5:25 PM, Lukas Tönne <lukas.toenne at gmail.com> wrote:
>> I like the idea! Doing test builds is always a time consuming and tedious
>> process, and forces me bother other coders to make windows builds ...
>> (thanks Antonis!).
>>
>> Revert is the best option i guess. This should ideally be done by everyone
>> after using the build bots, but anyone can do it in case the previous coder
>> didn't clean up properly. That is, as long as people don't start racing for
>> milliseconds of who-commits-first of course ;)
>>
>>
>> On Tue, Jul 29, 2014 at 9:06 AM, Sergey Sharybin <sergey.vfx at gmail.com>
>> wrote:
>>
>>> Technically it's possible, with one huge BUT -- you'll need to force-push
>>> which is really a bad idea.
>>>
>>> Would rather suggest reverting stuff by:
>>>
>>> $ git revert HASH
>>>
>>> Here you can also revert several commits, or if you're really screwed up:
>>>
>>> $ git diff master | patch -p1 -R
>>> $ git commit -a -m "Reverting branch to the master"
>>>
>>> Would actually prefer first way since it's more friendly for re-using the
>>> git objects and wouldn't lead to possible merge issues in the future.
>>>
>>>
>>> On Tue, Jul 29, 2014 at 1:53 AM, Dalai Felinto <dfelinto at gmail.com> wrote:
>>>
>>>> Alright, after talking with Bastien my suggestion is:
>>>> $ git checkout testbuild
>>>> $ git merge origin/master
>>>> $ git merge --squash mywippatch
>>>> $ git commit
>>>> $ git revert HEAD
>>>> $ git push origin
>>>>
>>>> Notice that this maintains the branch always 1:1 with origin/master.
>>>> So no one has to clean after your commits. You will need to specify
>>>> the hash of the HEAD^1 to the Builder Slave.
>>>> Regards,
>>>> Dalai
>>>> --
>>>> blendernetwork.org/dalai-felinto
>>>> www.dalaifelinto.com
>>>>
>>>>
>>>> 2014-07-28 16:32 GMT-03:00 Dalai Felinto <dfelinto at gmail.com>:
>>>>> Hi,
>>>>> This is great, really useful. It would be really handy if at least the
>>>>> testbuild branch in the server could use non-fast-forward. In other
>>>>> words, if it could use it as follow:
>>>>>
>>>>> $ git checkout testbuild
>>>>> $ git reset --hard origin/master
>>>>> $ git merge --squash mywippatch
>>>>> $ git commit
>>>>> $ git push --force
>>>>>
>>>>> Would that be possible? Or git handles those permissions globally and
>>>>> not per branch?
>>>>>
>>>>> Cheers,
>>>>> Dalai
>>>>> --
>>>>> blendernetwork.org/dalai-felinto
>>>>> www.dalaifelinto.com
>>>>>
>>>>>
>>>>> 2014-07-25 9:28 GMT-03:00 Bastien Montagne <montagne29 at wanadoo.fr>:
>>>>>> Hi fellow devs,
>>>>>>
>>>>>> This week we set up a way to make test builds on the buildbots
>>> (meaning
>>>>>> you get release-like archives, easy to distribute! :) ).
>>>>>>
>>>>>> Here are the steps to follow:
>>>>>> * Checkout the 'testbuild' branch, apply your code to it (probably by
>>>>>> reseting it to master and then squash-merging in your own work);
>>>>>> * Push your changes on remote repo;
>>>>>> * Go to one of the buildbot's builders' page (e.g.
>>>>>> https://builder.blender.org/builders/linux_glibc211_x86_64_scons) -
>>>> note
>>>>>> you'll need to do that for all platforms you want to build on.
>>>>>> * Select 'testbuild' instead of 'master' in the branch dropdown, and
>>>>>> force the build.
>>>>>> * Note you can also force a given revision, can be handy as it means
>>> you
>>>>>> can still build your work even if someone has overriden it in
>>> testbuild
>>>>>> branch.
>>>>>> * Download your testbuild as soon as it is finished! It will be
>>> replaced
>>>>>> by the next test build (for a given builder).
>>>>>>
>>>>>> Quite obviously, let's try not to abuse the feature! :)
>>>>>>
>>>>>> _______________________________________________
>>>>>> Bf-committers mailing list
>>>>>> Bf-committers at blender.org
>>>>>> http://lists.blender.org/mailman/listinfo/bf-committers
>>>> _______________________________________________
>>>> Bf-committers mailing list
>>>> Bf-committers at blender.org
>>>> http://lists.blender.org/mailman/listinfo/bf-committers
>>>>
>>>
>>>
>>> --
>>> With best regards, Sergey Sharybin
>>> _______________________________________________
>>> Bf-committers mailing list
>>> Bf-committers at blender.org
>>> http://lists.blender.org/mailman/listinfo/bf-committers
>>>
>> _______________________________________________
>> Bf-committers mailing list
>> Bf-committers at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-committers
>
>