← Back to team overview

dhis2-devs-core team mailing list archive

Re: 2.24 Branch

 

Ok, it seems Mark's advice on branching for 2.24 wasn't really followed.
This broke TC in 2.24. In short, commits were made post 2.24 release which
were out of sync with the trunk angular services, causing failure on
loading TC.

I have now fixed it by branching v24, reverting the offending commits,
redeploying and switching TC (only) to 2.25-SNAPSHOT in the web apps
pom.xml.

This means that you (Markus, Abyot, Jiju) *must now make sure backports are
made to origin/v24* and built/deployed from there, whilst *dev changes are
made and deployed only to master*.

This is very important. Unf___ing these things are complicated and time
consuming, especially when everyone's on holiday ;)

On Fri, Jul 1, 2016 at 11:49 AM, Mark Polak <mark@xxxxxxxxx> wrote:

> Darn shift + enter! :P
>
> Anyways to comment on Markus his list
>
> Well - I am just thinking this up, but assumed that we need to:
> - Branch out 2.24 TC and EC in git
> *Yes into a "v24" branch*
> - Update the version numbers in the pom files for the 2.24 git branches to
> be 2.24(not 2.24 snapshot)
> *No, keep it 2.24-SNAPSHOT*
> - Update the version numbers in the pom files for the master git branches
> to be 2.25-SNAPSHOT
> *Yes*
> - Build and publish both versions of the apps.
> *Yes*
> - Update the dhis2 trunk in launchpad to download the 2.25-SNAPSHOT
> version of the apps
> *Yes*
> - Update the dhis2 2.24 branch to download the 2.24 versions of the apps
> *No, we keep snapshot for the reason mentioned in the previous mail ;)*
>
> On Fri, Jul 1, 2016 at 11:46 AM, Mark Polak <mark@xxxxxxxxx> wrote:
>
>> Hey All,
>>
>> Markus is almost right ;)
>>
>> The apps are currently versioned by git branches, so basically just like
>> the launchpad branches. The settings-app for example, the list of branches
>> is as follows.
>>
>> [image: Inline image 1]
>>
>> Master is the current dev version (in this case still 2.24)
>> The v22 and v23 branches represent the 2.23 and 2.23 versions of DHIS2.
>> (We agreed on the vXX version number a while back so it's currently in use
>> for GIS as well)
>> All the pom.xml files in those repositories are still SNAPSHOT versions.
>>
>> The release steps are as follows
>>
>>    - master will be branched into v24 (The pom.xml will stay the same so
>>    still 2.24-SNAPSHOT)
>>    - The pom.xml  file in master will be changed to 2.25-SNAPSHOT
>>    - In DHIS2 core trunk the apps version will need to be changed
>>    to 2.25-SNAPSHOT. (The version in core 2.24 will stay 2.24-SNAPSHOT, so new
>>    builds will always download the latest apps for that version)
>>    - Backports can be done in the vXX branches and be deployed by
>>    running `npm run build` and `mvn clean deploy`
>>    - Dev cycle starts over :)
>>    - Profit??
>>    -
>>
>>
>> On Fri, Jul 1, 2016 at 11:36 AM, Markus Bekken <markus.bekken@xxxxxxxxx>
>> wrote:
>>
>>> Well - I am just thinking this up, but assumed that we need to:
>>> - Branch out 2.24 TC and EC in git
>>> - Update the version numbers in the pom files for the 2.24 git branches
>>> to be 2.24(not 2.24 snapshot)
>>> - Update the version numbers in the pom files for the master git
>>> branches to be 2.25-SNAPSHOT
>>> - Build and publish both versions of the apps.
>>> - Update the dhis2 trunk in launchpad to download the 2.25-SNAPSHOT
>>> version of the apps
>>> - Update the dhis2 2.24 branch to download the 2.24 versions of the apps
>>>
>>> ...you guys can probably review my thinking here.
>>>
>>> 1. jul. 2016 kl. 11.29 skrev Abyot Asalefew Gizaw <abyot@xxxxxxxxx>:
>>>
>>> not yet. I am asking Morten and Mark how they are doing it or or we
>>> should do it. if you know how to do it - please.
>>>
>>> --
>>> Abyot A. Gizaw.
>>> Senior Engineer, DHIS2
>>> University of Oslo
>>> http://www.dhis2.org
>>>
>>> On Fri, Jul 1, 2016 at 11:09 AM, Markus Bekken <markus.bekken@xxxxxxxxx>
>>> wrote:
>>>
>>>> Should I branch out 2.24 of the apps and link to stable versions from
>>>> bazaar? or are you already doing it perhaps?
>>>>
>>>> 1. jul. 2016 kl. 10.34 skrev Morten Olav Hansen <morten@xxxxxxxxx>:
>>>>
>>>> Hi everyone
>>>>
>>>> We have started the release process, 2.24 branch is now available at:
>>>> https://code.launchpad.net/~dhis2-devs-core/dhis2/2.24
>>>> (bzr checkout lp:~dhis2-devs-core/dhis2/2.24)
>>>>
>>>> And CI job is up and running here:
>>>> http://ci.dhis2.org/job/dhis2-2.24/
>>>>
>>>> Please make sure from now, that you update both 2.24 branch and
>>>> 2.25-SNAPSHOT if you have anything that needs to be in 2.24 release.
>>>>
>>>> --
>>>> Morten Olav Hansen
>>>> Senior Engineer, DHIS 2
>>>> University of Oslo
>>>> http://www.dhis2.org
>>>> --
>>>> Mailing list: https://launchpad.net/~dhis2-devs-core
>>>> Post to     : dhis2-devs-core@xxxxxxxxxxxxxxxxxxx
>>>> Unsubscribe : https://launchpad.net/~dhis2-devs-core
>>>> More help   : https://help.launchpad.net/ListHelp
>>>>
>>>>
>>>>
>>>
>>>
>>
>>
>> --
>> Regards,
>>
>>
>> Mark Polak
>> Software developer, DHIS 2
>> University of Oslo
>> http://www.dhis2.org <https://www.dhis2.org/>
>> mark@xxxxxxxxx
>>
>
>
>
> --
> Regards,
>
>
> Mark Polak
> Software developer, DHIS 2
> University of Oslo
> http://www.dhis2.org <https://www.dhis2.org/>
> mark@xxxxxxxxx
>
> --
> Mailing list: https://launchpad.net/~dhis2-devs-core
> Post to     : dhis2-devs-core@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dhis2-devs-core
> More help   : https://help.launchpad.net/ListHelp
>
>


-- 
Halvdan Hoem Grelland
Software developer, DHIS 2
University of Oslo
http://www.dhis2.org <https://www.dhis2.org/>

Follow ups

References