[Sugar-devel] Sugarizer dev platform is now open

Lionel Laské lionel.laske at gmail.com
Thu Mar 23 16:40:21 EDT 2017
Previous message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Next message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Ah okay :-)

I don't think the merge between those repositories is possible using git.
Personally, I just copy/replace all files in the activity repository.
git gives updated files so it's easy to see changes or to do a PR.

Regarding git submodules, why not but it has drawbacks too.
I will think about it.

                 Lionel.


2017-03-23 18:53 GMT+01:00 Walter Bender <walter.bender at gmail.com>:

> Opps. I meant:
>
> https://github.com/walterbender/turtleblocksjs
>
> -walter
>
> On Thu, Mar 23, 2017 at 1:50 PM, Lionel Laské <lionel.laske at gmail.com>
> wrote:
>
>> So Musicblocks [1] is the same thing than TurtleBlockJS [2] ?
>> And you want to replace the second by the first ?
>> Where did you apply missing commits ? in Musicblocks ? in TurtleBlockJS ?
>>
>>
>> [1] https://github.com/walterbender/musicblocks
>> [2] https://github.com/walterbender/turtleblocksjs
>>
>> 2017-03-23 18:38 GMT+01:00 Walter Bender <walter.bender at gmail.com>:
>>
>>> The current master [1] should be what you need. I created a fork of
>>> Sugarizer [2] but I don't know how to properly merge changes in [1] into
>>> [3] so that I can create a PR for you.
>>>
>>> -walter
>>>
>>>
>>> [1] https://github.com/walterbender/musicblocks
>>> [2] https://github.com/walterbender/sugarizer
>>> [3] https://github.com/walterbender/sugarizer/tree/master/ac
>>> tivities/TurtleBlocksJS.activity
>>>
>>> On Thu, Mar 23, 2017 at 1:31 PM, Lionel Laské <lionel.laske at gmail.com>
>>> wrote:
>>>
>>>> Good news.
>>>> Sorry I'm not a git expert. Not even sure to understand your question
>>>> :-)
>>>> But if you point me the branch that I need to get in TurtleJS, I will
>>>> do the integration of the new version in Sugarizer.
>>>>
>>>>         Lionel.
>>>>
>>>>
>>>> 2017-03-23 0:58 GMT+01:00 Walter Bender <walter.bender at gmail.com>:
>>>>
>>>>> OK. I have managed to find all your changes (5-6 commits scattered
>>>>> throughout the code) and apply them to my current master. Git question: How
>>>>> do apply all of my commits on my master back to my fork of your fork so I
>>>>> can make the pull request?
>>>>>
>>>>> -walter
>>>>>
>>>>>
>>>>> On Wed, Mar 22, 2017 at 5:48 PM, Lionel Laské <lionel.laske at gmail.com>
>>>>> wrote:
>>>>>
>>>>>>
>>>>>> I don't remember that I've done change in TurtleJS recently.
>>>>>> In my mind the last thing changed was the integration done by Michaël
>>>>>> two years ago (specifically the Stop button).
>>>>>> If you've got it and if TurtleJS works on Chrome, Firefox, Safari and
>>>>>> EDGE, I'm confident that it will work on Sugarizer.
>>>>>>
>>>>>>          Lionel.
>>>>>>
>>>>>>
>>>>>> 2017-03-22 22:35 GMT+01:00 Walter Bender <walter.bender at gmail.com>:
>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> On Wed, Mar 22, 2017 at 4:56 PM, Lionel Laské <
>>>>>>> lionel.laske at gmail.com> wrote:
>>>>>>>
>>>>>>>>
>>>>>>>> You're right Sugarizer include a set of activities because my top
>>>>>>>> priority is to simplify deployment and testing. So put activities outside
>>>>>>>> of the Sugarizer repository would be too complex.
>>>>>>>>
>>>>>>>> BTW each activity author should maintain its own repository for
>>>>>>>> this activity. For example, the Abacus activity is maintain be Eon here [1].
>>>>>>>> In Sugarizer, each activity is store in its own subdirectory under
>>>>>>>> the Sugarizer "activities" directory. This subdirectory is just a copy of
>>>>>>>> the activity repository content. If an activity change, the author has just
>>>>>>>> to recopy all files in its own Sugarizer subdirectory then send to me a
>>>>>>>> pull request (to the dev branch).
>>>>>>>> Conversely, if for compatibility reason I need to change something
>>>>>>>> in an activity, I sent myself a PR to the  author repository. For example,
>>>>>>>> I've slightly adapted Abacus for Android/iOS so I sent a PR to Eon here
>>>>>>>>
>>>>>>>
>>>>>>> Good in theory, but it appears that there are commits to Turtle that
>>>>>>> you never pushed back to me, so I am stuck. That is what triggered my
>>>>>>> question about process.
>>>>>>>
>>>>>>> -walter
>>>>>>>
>>>>>>>
>>>>>>>> [2]. So at end both repositories are synced.
>>>>>>>>
>>>>>>>> I will write this rules in the README so it will be clear.
>>>>>>>>
>>>>>>>>          Lionel.
>>>>>>>>
>>>>>>>>
>>>>>>>> [1] https://github.com/eohomegrownapps/abacus-activity
>>>>>>>> [2] https://github.com/eohomegrownapps/abacus-activity/pull/
>>>>>>>> 1#event-1008961890
>>>>>>>>
>>>>>>>>
>>>>>>>> 2017-03-21 23:23 GMT+01:00 <sugar-devel-request at lists.sugarlabs.org
>>>>>>>> >:
>>>>>>>>>
>>>>>>>>> Date: Tue, 21 Mar 2017 18:16:13 -0400
>>>>>>>>> From: Walter Bender <walter.bender at gmail.com>
>>>>>>>>> To: Lionel Laské <lionel at olpc-france.org>
>>>>>>>>> Cc: Sugar-dev Devel <sugar-devel at lists.sugarlabs.org>,  "Community
>>>>>>>>>         Support Volunteers -- who help respond to help AT
>>>>>>>>> laptop.org"
>>>>>>>>>         <support-gang at lists.laptop.org>, iaep <
>>>>>>>>> iaep at lists.sugarlabs.org>
>>>>>>>>> Subject: Re: [Sugar-devel] Sugarizer dev platform is now open
>>>>>>>>> Message-ID:
>>>>>>>>>         <CADf7C8uEUd6nMs_-fShGXZaqpwCumKUpMP37x96U=
>>>>>>>>> N5kMO9gnA at mail.gmail.com>
>>>>>>>>> Content-Type: text/plain; charset="utf-8"
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> I don't understand what is your model for maintaining activities.
>>>>>>>>> It seems
>>>>>>>>> everything is on one big repo and that you have scattershot
>>>>>>>>> changes in
>>>>>>>>> various activities, which are not sent to the upstream masters.
>>>>>>>>> How can
>>>>>>>>> make a PR to give you the latest Turtle Blocks bits without having
>>>>>>>>> to sort
>>>>>>>>> through your commit history to find all of your changes? Seems to
>>>>>>>>> put an
>>>>>>>>> extra burden on activity authors. What am I not understanding? Is
>>>>>>>>> there any
>>>>>>>>> documentation as to how you want activity authors to keep in sync
>>>>>>>>> with
>>>>>>>>> Sugarizer changes?
>>>>>>>>>
>>>>>>>>> -walter
>>>>>>>>>
>>>>>>>>> On Mon, Mar 20, 2017 at 5:48 PM, Lionel Laské <
>>>>>>>>> lionel.laske at gmail.com>
>>>>>>>>> wrote:
>>>>>>>>>
>>>>>>>>> >
>>>>>>>>> > Hi all,
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > Currently, Sugarizer is released about one time by year.
>>>>>>>>> >
>>>>>>>>> > I know that it's slow but it take us lot of time to test and
>>>>>>>>> package new
>>>>>>>>> > features and activities on all supported platforms.
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > To give you  a faster view of change in Sugarizer, I've decided
>>>>>>>>> to open a
>>>>>>>>> > new server dedicated to the development branch.
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > So, the branch "master" [1] is now the stable and
>>>>>>>>> ready-to-production
>>>>>>>>> > version and could be tested on http://try.sugarizer.org
>>>>>>>>> >
>>>>>>>>> > And the branch "dev" [2] is now the development version (*) - and
>>>>>>>>> > potentially unstable - and could be tested on the new
>>>>>>>>> > http://dev.sugarizer.org
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > If you're curious you could discover today on the dev branch:
>>>>>>>>> the great
>>>>>>>>> > ColorMyWorld activity from Charles Cossé and the nice port of
>>>>>>>>> XOEditor,
>>>>>>>>> > Reflection and Abacus activities by the GCI student Euan Ong.
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > Sugarizer is growing every day: stay in touch !
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > Best regards from France.
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >           Lionel.
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > [1] https://github.com/llaske/sugarizer/tree/master
>>>>>>>>> >
>>>>>>>>> > [2] https://github.com/llaske/sugarizer/tree/dev
>>>>>>>>> >
>>>>>>>>> > (*) So if you're a developer and want to contribute to
>>>>>>>>> Sugarizer, send
>>>>>>>>> > your PR to the dev branch
>>>>>>>>> >
>>>>>>>>>
>>>>>>>>
>>>>>>>> _______________________________________________
>>>>>>>> Sugar-devel mailing list
>>>>>>>> Sugar-devel at lists.sugarlabs.org
>>>>>>>> http://lists.sugarlabs.org/listinfo/sugar-devel
>>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> --
>>>>>>> Walter Bender
>>>>>>> Sugar Labs
>>>>>>> http://www.sugarlabs.org
>>>>>>> <http://www.sugarlabs.org>
>>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Walter Bender
>>>>> Sugar Labs
>>>>> http://www.sugarlabs.org
>>>>> <http://www.sugarlabs.org>
>>>>>
>>>>
>>>>
>>>
>>>
>>> --
>>> Walter Bender
>>> Sugar Labs
>>> http://www.sugarlabs.org
>>> <http://www.sugarlabs.org>
>>>
>>
>>
>
>
> --
> Walter Bender
> Sugar Labs
> http://www.sugarlabs.org
> <http://www.sugarlabs.org>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20170323/1a913ad7/attachment-0001.html>
Previous message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Next message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Sugar-devel mailing list