On 19.11.2016 19:42, Jo-Philipp Wich wrote:
> $version = the base version number, e.g. 16.11 - this is what I'd like to
be the main identifier
> $nickname = the symbolic name for a release branch, e.g. "Rolling Rabbit"
- due to its arbitrary nature I do not want it to be part of directories or
branch names
> $buildno = the number of the build produced by the build cluster dedicated
to building the 16.11 base version, see e.g. the "buildnumber" property at [1]
Sounds good. Just keep the same terminology everywhere;-)
> > - branch builds before release:
> That should be versioned like $version+git$shorthash, e.g.
"16.11+git6b40471".
> > - branch builds after a release:
> Assuming that for each released build we produce a tag then we would use
the tag as designation plus the current hash, e.g. "16.11.1+git6b40471" or we
can alternatively use the logic used for master and use the last tag as
version number and count the number of commits since it, e.g. 16.11.1+r5"
One comment to both of those: commit hash is not incremental, so the "+r5"
approach is better. Or even "+r5-+git6b40471".
You might also consider something similar as the LuCI "timestamp of last
commit + hash" approach.
Example: "Master (git-16.324.51057-1c27f6b)" and "for-15.05 branch
(git-16.043.44305-e2f9172)"
E.g. 16.11-16.324.51057-1c27f6b
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
