[WikiToLearn Tech] Fwd: Neverland as a submodule

Thu Mar 17 21:05:58 UTC 2016

Let's try it. Surely it works logically, we have to see if it adds too much
git work.

Bye
Davide

2016-03-17 22:04 GMT+01:00 Gianluca Rigoletti <gianluca.rigoletti at gmail.com>
:

> Ok for me. I will try to follow the procedure in the next days
>
> 2016-03-17 22:03 GMT+01:00 Davide Valsecchi <valsecchi.davide94 at gmail.com
> >:
> > I think it's better to keep it as a submodule. Well, so we can create the
> > "release branches" on Neverland along with master to link with the main
> > repo? it's ok for you?
> >
> > 2016-03-17 0:31 GMT+01:00 Ingo Malchow <imalchow at kde.org>:
> >>
> >> Am Mittwoch, 16. März 2016, 22:09:13 CET schrieb Gianluca Rigoletti:
> >> > So,
> >> > as far as I understand, we should use Neverland as a submodule and
> >> > follow the git workflow like the main codebase. I want to know it just
> >> > to be sure to do my commits in the correct way. It happened that few
> >> > weeks ago there were some minor fixes and suddenly all of the git
> >> > branching elaborated by Davide has been called into question. That is
> >> > why I started this topic. I don't really have ideas about this; I just
> >> > want to be sure that once everyone agrees we will stay consistent with
> >> > what we've chosen to do :)
> >>
> >> There is another option, just to have it mentioned. Do not use neverland
> >> as
> >> submodule at all, but let the setup script simply clone it into the
> skins
> >> dir.
> >> As this is a mediawiki clone, the gitignore should be fine with it.
> >> That way you won't need to update the submodule on each change.
> >>
> >> But really, only to have it mentioned.
> >>
> >> >
> >> > 2016-03-16 21:39 GMT+01:00 Luca Toma <toma.luca95 at gmail.com>:
> >> > > The basic idea is: (our) neverland is not a thing like the main
> >> > > homepage,
> >> > > is a standard mediawiki theme developed for wikitolearn.
> >> > > I think we can tell to evry developer that works only on the theme
> to
> >> > > use
> >> > > a
> >> > > standard setup of mediawiki to write the code and test it, only
> after
> >> > > this
> >> > > we need to test it on the wikitolearn env, this workflow can speed
> up
> >> > > the
> >> > > theme development and allow evry html/css/php developer to work on
> the
> >> > > theme without have to install all wikitolearn stuff.
> >> > >
> >> > > I think we can't use one repo because the theme and wikitolearn
> aren't
> >> > > the
> >> > > same thing, also about the history of the repo: if you have only one
> >> > > repo
> >> > > there isn't a log for only the theme stuff but you have to deal
> >> > > evrytime
> >> > > with other things not related to the skin (like new OCG image, or
> new
> >> > > script stuff).
> >> > >
> >> > > My idea is about allow a developer to have only things required to
> >> > > work
> >> > > and
> >> > > have one repo for evrything is not the way, i think we are on the
> >> > > right
> >> > > way
> >> > > for this, "I wouldn't like to change the way"
> >> > >
> >> > > Toma Luca
> >> > >
> >> > > 2016-03-16 20:47 GMT+01:00 Davide Valsecchi
> >> <valsecchi.davide94 at gmail.com>:
> >> > >> 2016-03-16 20:45 GMT+01:00 Ingo Malchow <imalchow at kde.org>:
> >> > >>> Am Mittwoch, 16. März 2016, 20:35:49 CET schrieb Davide Valsecchi:
> >> > >>> > I see that you prefer Neverland as a submodule and it does makes
> >> > >>> > sense.
> >> > >>> > So
> >> > >>> > we have to think about its git workflow. Remember that the main
> >> > >>> > repo
> >> > >>> > is
> >> > >>> > organized in this way
> >> > >>> >
> >> > >>> >
> >> > >>> >
> http://meta.wikitolearn.org/Guide_for_the_development_of_WikiToLearn/G
> >> > >>> > it_Wor kflow .
> >> > >>> >
> >> > >>> > Neverland could have a different flow, but it must be consistent
> >> > >>> > with
> >> > >>> > the
> >> > >>> > main one.
> >> > >>> > I know that submodules are referenced only as single commits,
> but
> >> > >>> > it
> >> > >>> > could
> >> > >>> > be a problem to leave Neverland only with master with different
> >> > >>> > branches on
> >> > >>> > WTL.
> >> > >>>
> >> > >>> Can you ellaborate on the last part? Does it mean it is _not_
> >> > >>> possible
> >> > >>> to
> >> > >>> have
> >> > >>> different branches on a submodule with the intended workflow?
> >> > >>>
> >> > >>> Apart from that, the WTL workflow looks a lot like
> >> > >>> http://nvie.com/posts/a-successful-git-branching-model/, which i
> >> > >>> personally
> >> > >>> favor as well (if that
> >> > >>> counts). ;)
> >> > >>
> >> > >> I copied it :)
> >> > >>
> >> > >> yes one possibility is following the same workflow on Neverland,
> it's
> >> > >> not
> >> > >> a problem, but could have a lot of git overhead to the work.
> >> > >>
> >> > >>> > What do you think? I don't have a definite idea about that
> >> > >>> >
> >> > >>> > Davide
> >> > >>> >
> >> > >>> > 2016-03-16 18:30 GMT+01:00 Ingo Malchow <ingo at neverendingi.de>:
> >> > >>> > > Am 16.03.2016 15:47 schrieb Luca Toma <toma.luca95 at gmail.com
> >:
> >> > >>> > > > Hi,
> >> > >>> > > > I think we have to keep it in its own repository because
> >> > >>> > > > basicaly
> >> > >>> > > > is a
> >> > >>> > >
> >> > >>> > > mediawiki skin and this kind of stuff is designed to be a
> module
> >> > >>> > > quite
> >> > >>> > > indipendent.
> >> > >>> > >
> >> > >>> > > > In theory the skin workflow can be quite indipendent and can
> >> > >>> > > > be
> >> > >>> > >
> >> > >>> > > developed in a standard mediawiki setup.
> >> > >>> > >
> >> > >>> > >
> >> > >>> > > Agreed, wikimedia itself does it the same way, all themes are
> >> > >>> > > available as
> >> > >>> > > separate clone or submodule, and the skins dir is added to
> >> > >>> > > gitignore.
> >> > >>> > >
> >> > >>> > > > Bye
> >> > >>> > > >
> >> > >>> > > > Toma Luca
> >> > >>> > > >
> >> > >>> > > > 2016-03-15 19:33 GMT+01:00 Davide Valsecchi <
> >> > >>> > >
> >> > >>> > > valsecchi.davide94 at gmail.com>:
> >> > >>> > > >> Hi!
> >> > >>> > > >>
> >> > >>> > > >> I see two possible ways to fit Neverland git flow in the
> new
> >> > >>> > > >> model:
> >> > >>> > > >>
> >> > >>> > > >> 1) inserting neverland into WTL main repo could be really
> >> > >>> > > >> convenient.
> >> > >>> > >
> >> > >>> > > The docker part is going to be removed so now the repo is
> >> > >>> > > becoming
> >> > >>> > > only
> >> > >>> > > mediawiki development: adding the skin could simplify the
> >> > >>> > > traking.
> >> > >>> > >
> >> > >>> > > >> 2) if we want to have neverland as a submodule we should
> >> > >>> > > >> follow
> >> > >>> > > >> the new
> >> > >>> > >
> >> > >>> > > git flow also inside it, for consistency. Doing so there is a
> >> > >>> > > lot of
> >> > >>> > > git
> >> > >>> > > work for every commit, keeping in mind the changes are usually
> >> > >>> > > hotifixes.
> >> > >>> > >
> >> > >>> > > >> What do you think?
> >> > >>> > > >> Bye
> >> > >>> > > >>
> >> > >>> > > >> Davide
> >> > >>> > > >>
> >> > >>> > > >> 2016-03-15 19:24 GMT+01:00 Cristian Baldi <bld.cris.
> >> 96 at gmail.com>:
> >> > >>> > > >>> Hey,
> >> > >>> > > >>>
> >> > >>> > > >>> From an organization point I would prefer leaving them
> >> > >>> > > >>> separated:
> >> > >>> > > >>> even
> >> > >>> > >
> >> > >>> > > if Neverland is deeply connected with our repo (because of all
> >> > >>> > > the
> >> > >>> > > custom
> >> > >>> > > stuff we have applied to it), skins are something that should
> be
> >> > >>> > > outside
> >> > >>> > > the mediawiki repo.
> >> > >>> > >
> >> > >>> > > >>> From your perspective I understand why that could be
> useful:
> >> > >>> > > >>> faster
> >> > >>> > >
> >> > >>> > > developing and no way to forget to update the submodule.
> >> > >>> > >
> >> > >>> > > >>> Let's wait for more experienced git guys to answer.
> >> > >>> > > >>>
> >> > >>> > > >>> 2016-03-15 18:18 GMT+00:00 Gianluca Rigoletti <
> >> > >>> > >
> >> > >>> > > gianluca.rigoletti at gmail.com>:
> >> > >>> > > >>>> Hey everyone!
> >> > >>> > > >>>> What do you think about integrating Neverland in the main
> >> > >>> > > >>>> repo
> >> > >>> > > >>>> and
> >> > >>> > > >>>> get
> >> > >>> > > >>>> rid of it as a submodule?
> >> > >>> > > >>>> At the moment, the majority of the Neverland commits are
> >> > >>> > > >>>> hotfixes and
> >> > >>> > > >>>> there are not really new features.
> >> > >>> > > >>>> It is a short question but I need to understand how to
> move
> >> > >>> > > >>>> in
> >> > >>> > > >>>> the
> >> > >>> > > >>>> next few days for pushing some commits.
> >> > >>> > > >>>>
> >> > >>> > > >>>> Bye!
> >> > >>> > > >>>>
> >> > >>> > > >>>> --
> >> > >>> > > >>>> Gianluca
> >> > >>> > > >>>> _______________________________________________
> >> > >>> > > >>>> WikiToLearn-Tech mailing list
> >> > >>> > > >>>> WikiToLearn-Tech at kde.org
> >> > >>> > > >>>> https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >> > >>> > > >>>
> >> > >>> > > >>> _______________________________________________
> >> > >>> > > >>> WikiToLearn-Tech mailing list
> >> > >>> > > >>> WikiToLearn-Tech at kde.org
> >> > >>> > > >>> https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >> > >>> > > >>
> >> > >>> > > >> _______________________________________________
> >> > >>> > > >> WikiToLearn-Tech mailing list
> >> > >>> > > >> WikiToLearn-Tech at kde.org
> >> > >>> > > >> https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >> > >>>
> >> > >>> --
> >> > >>> Ingo Malchow
> >> > >>> _______________________________________________
> >> > >>> WikiToLearn-Tech mailing list
> >> > >>> WikiToLearn-Tech at kde.org
> >> > >>> https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >> > >>
> >> > >> _______________________________________________
> >> > >> WikiToLearn-Tech mailing list
> >> > >> WikiToLearn-Tech at kde.org
> >> > >> https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >> > >
> >> > > _______________________________________________
> >> > > WikiToLearn-Tech mailing list
> >> > > WikiToLearn-Tech at kde.org
> >> > > https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >>
> >>
> >> --
> >> Ingo Malchow
> >> _______________________________________________
> >> WikiToLearn-Tech mailing list
> >> WikiToLearn-Tech at kde.org
> >> https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >
> >
> >
> > _______________________________________________
> > WikiToLearn-Tech mailing list
> > WikiToLearn-Tech at kde.org
> > https://mail.kde.org/mailman/listinfo/wikitolearn-tech
> >
>
>
>
> --
> Gianluca
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/wikitolearn-tech/attachments/20160317/1b7f335a/attachment-0001.html>