[asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

[George Joseph]

On Wed, Dec 20, 2017 at 2:44 AM, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
wrote:

> Off-topic:
>
> On Tue, Dec 19, 2017 at 01:50:03PM -0700, George Joseph wrote:
>
> > Thankfully we tag EVERYTHING! :)
>
> asterisk(13)$ git describe
> 13.15.0-rc1-908-ge31e3b581b
>
> asterisk(14)$ git describe
> fatal: No tags can describe 'fb18797ae09a685ec71101499fb1c1c606b16397'.
> Try --always, or create some tags.
>
> asterisk(15)$ git describe
> fatal: No tags can describe 'd312068ee93ff8ce97b464f3c2ff3304e15cb3fe'.
> Try --always, or create some tags.
>
>
> I wasted half an hour yesterday trying to find out why a build sis not
> switch from master to 13, only to realize that the name of the git
> branch in the version string is always "master".
>
> We tag everything. But only well after it was branched from the main
>
branch.
>

I'm not following you.

We tag every release...

$ git checkout 13.18.4
HEAD is now at f4644317b7... Update for 13.18.4
$ git describe
13.18.4
$ commit f4644317b7dd1963c92dc13295027cdfbb4fbc5e (HEAD, tag: 13.18.4,
gerrit/13.18, 13.18)
Author: George Joseph <gjoseph at digium.com>
Date:   Wed Dec 13 09:33:48 2017 -0500

    Update for 13.18.4

commit 8052b5d76ed5d2b16436335c67877c1a09012c3c
$

The commit that's tagged is the one that has all the housekeeping
(ChangeLog, summaries, .version) for the release so that commit will never
be in the main branches.  It will be in the release branches however...

$ git checkout 13.18
Switched to branch '13.18'
Your branch is up-to-date with 'gerrit/13.18'.
$ git describe
13.18.4
$

We have to create the minor release branch (13.18) and do the work there so
that patch releases (13.18.4) are based on the minor release branch, not
the major branch.














>
> --
>                Tzafrir Cohen
> +972-50-7952406           mailto:tzafrir.cohen at xorcom.com
> http://www.xorcom.com
>
> --
> _____________________________________________________________________
> -- Bandwidth and Colocation Provided by http://www.api-digital.com --
>
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
>    http://lists.digium.com/mailman/listinfo/asterisk-dev
>



-- 
George Joseph
Digium, Inc. | Software Developer
445 Jan Davis Drive NW - Huntsville, AL 35806 - US
Check us out at: www.digium.com & www.asterisk.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20171220/b1eebee5/attachment.html>