← Back to team overview

fenics team mailing list archive

Re: Development model

 

Another question is whether to include topic branches in the main
repository. PETSc does this and currently lists 59 branches:

https://bitbucket.org/petsc/petsc/overview

It gives a good overview of what's going on at the moment.

It might be possible to combine this with a larger group of people
having write access (but limit the integration/review/merge to master
to a smaller group).

--
Anders


On Wed, Apr 17, 2013 at 04:50:23PM +0200, Martin Sandve Alnæs wrote:
> The send-a-patch-to-the-trybot approach is very hard to use if you
> want to e.g. run ffc/dolfin tests with changes to ufl/ufc. The
> approach with the old buildbot where a set of branches for all
> projects can be used for running tests was much more useful. If I can
> push my work to e.g. martinal/<project>/buildbot and run a 'buildbot
> ...' command to schedule tests that would be extremely helpful.
>
> Martin
>
> On 17 April 2013 16:21, Garth N. Wells <gnw20@xxxxxxxxx> wrote:
> > On 17 April 2013 14:54, Martin Sandve Alnæs <martinal@xxxxxxxxx> wrote:
> >> So, will we do something like this?
> >>
> >> - checkout topic branch from master
> >> - work on topic
> >> - test locally
> >>
> >> - merge topic into next
> >> - test locally
> >>
> >> - push to fenics/dolfin/next
> >> - wait for green buildbot and allow time for others to (pro)test
> >>
> >> - merge topic into master
> >> - test locally
> >>
> >> - push to fenics/dolfin/master
> >> - wait for green buildbot
> >>
> >> - breathe out relieved
> >>
> >> Would it also be possible (in due time) to point the buildbot to e.g.
> >> my personal martinal/<project>/next branches? I miss being able to
> >> test changes to ufl/ufc/ffc/dolfin together on buildbot before
> >> integrating.
> >>
> >
> > It was possible to ask the buildbot to run a particular branch. It
> > would be neat if we could just paste in the location of a git branch
> > and have the tests run. If it's made easy, we could insist that
> > contributors run their proposed changes through the buildbot before
> > making a merge request.
> >
> > Garth
> >
> >> Martin
> >>
> >>
> >> On 17 April 2013 14:42, Johannes Ring <johannr@xxxxxxxxx> wrote:
> >>> On Wed, Apr 17, 2013 at 2:08 PM, Anders Logg <logg@xxxxxxxxx> wrote:
> >>>> One thing though is that it perhaps doesn't make sense to create the
> >>>> 'next' branch at this point, until it is being tested by the buildbot?
> >>>>
> >>>> I think Johannes is working on getting it running.
> >>>
> >>> The buildbot is running again now, although I have currently only
> >>> enabled a few of the buildslaves since I have had some problems
> >>> getting polling of changes from Bitbucket to work. It looks like it is
> >>> working now, so I will enable the rest of the buildslaves soon.
> >>>
> >>> Johannes
> >>>
> >>> _______________________________________________
> >>> Mailing list: https://launchpad.net/~fenics
> >>> Post to     : fenics@xxxxxxxxxxxxxxxxxxx
> >>> Unsubscribe : https://launchpad.net/~fenics
> >>> More help   : https://help.launchpad.net/ListHelp
> >>
> >> _______________________________________________
> >> Mailing list: https://launchpad.net/~fenics
> >> Post to     : fenics@xxxxxxxxxxxxxxxxxxx
> >> Unsubscribe : https://launchpad.net/~fenics
> >> More help   : https://help.launchpad.net/ListHelp
>
> _______________________________________________
> Mailing list: https://launchpad.net/~fenics
> Post to     : fenics@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~fenics
> More help   : https://help.launchpad.net/ListHelp


References