I've done some more research into this, and it turns out we are actually using annotated tags (and sometimes even signed tags which are annotated tags that contain a gpg signature). This is very much a good thing. Note that you can run 'git tag -v 1.2.0' on a nakamura checkout and find out whether or not you have the actual tag that Zach made or if someone has tampered with your repo.
The problem with the version number in the footer on builds from master though is that if you go back through the history of master the 1.2 and 1.3 tags aren't actually there, the release process (I'm assuming mvn-release-plugin, but some of this might be manual or scripted) does the following: 1. makes a branch 2. updates version numbers in the branch as x.y 3. tags the branch 4. updates the version numbers in master to x.z-SNAPSHOT So master never gets the tag commit. If we could insert a step between 3 and 4 that merged the branch back to master we'd get back reasonable version numbers in builds from master. On Thu, May 31, 2012 at 02:30:10PM -0400, D. Stuart Freeman wrote: > I find it interesting though that the build from the tip of the 1.3 > branch is showing as 1.1-688-XYZ, I think if we used "annotated tags" > instead of the current "lightweight tags" we might get something more > like the expected 1.3-000-XYZ. > > For more about annotated tags see > http://stackoverflow.com/q/4971746/201201 > > They're just as easy to create as the lightweight ones: > git tag -am "tagging 1.3 for release" 1.3 > > On Thu, May 31, 2012 at 11:12:10AM -0700, Chris Tweney wrote: > > There are tags for 1.2, 1.3, etc, but I believe qa20 is not running a > > regular tag at the moment, it's running a build of the tip of nakamura's > > 1.3.0 branch. > > > > If you build the 1.3.0-RC1 tag of nakamura and launch it, you see this > > in the debug area: > > > > DEBUG: Nakamura Version: 1.3.0-RC1 | UX Version: > > org.sakaiproject.nakamura.uxloader-1.3.0 > > > > Which seems right on to me. The released version will show less > > confusing data. > > > > -chris > > > > On 5/31/12 10:55 AM, Nate Angell wrote: > > > Got it! Thanks! > > > > > > So the good news is the information is automatically provided and > > > accurate. The bad news is mere mortals can't make sense out of it ;) > > > > > > I guess what is confusing me, IIUC, is why there aren't tags for 1.2, > > > 1.3, 1.4, etc, but I'm sure you all have good reasons. > > > > > > = nate > > > > > > On Thu, May 31, 2012 at 10:48 AM, Chris Tweney <[email protected] > > > <mailto:[email protected]>> wrote: > > > > > > That data is accurate and current. It's automatically updated. It > > > comes > > > from the output of "git describe" on each code tree (nakamura and > > > 3akai-ux). > > > > > > The last component (in nakamura, "g568911e") is the SHA1 of the most > > > recent commit in the 1.3.0 branch. The "1.1" is the most recent tag. > > > "688" is the number of commits that have happened since that tag. > > > > > > From the git-describe man page: > > > > > > The command finds the most recent tag that is reachable from a > > > commit. If the tag points to the commit, then only the tag is > > > shown. Otherwise, it suffixes the tag name with the number of > > > additional commits on top of the tagged object and the > > > abbreviated object name of the most recent commit. > > > > > > Hope that helps, > > > > > > -chris > > > > > > On 5/31/12 10:25 AM, Nate Angell wrote: > > > > Thanks for the note Kent! > > > > > > > > Maybe I'm missing something, but it would be great if one could > > > tell the > > > > current nakamura/3akai build running on a QA server by clicking > > > on the > > > > Sakai logo in the footer to get debug info. Currently, this is > > > what I see: > > > > > > > > qa20 (supposedly 1.3?) > > > > DEBUG: Nakamura Version: 1.1-688-g568911e | UX Version: > > > 1.1-1384-g1dbd370 > > > > > > > > qa22 (supposedly 1.4?) > > > > DEBUG: Nakamura Version: 1.1-1046-g0e91e9e | UX Version: > > > 1.1-1440-g061af01 > > > > > > > > Is there a way to ensure the debug message always accurately > > > reports > > > > what builds are running, or is such a mechanism already in place? > > > > > > > > If it's not already, automating this would be a good thing not > > > just for > > > > qa servers, but for the platform in general. > > > > > > > > = nate > > > > > > > > On Thu, May 31, 2012 at 5:01 AM, Kent Fitzgerald > > > <[email protected] <mailto:[email protected]> > > > > <mailto:[email protected] <mailto:[email protected]>>> wrote: > > > > > > > > FYI: > > > > qa22 [1] will be updated to the 1.4.0 branch today > > > > qa20 [2] will remain on 1.3 for the time being. > > > > > > > > [1] http://qa22-us.sakaiproject.org > > > > [2] https://qa20-us.sakaiproject.org:8088 > > > > > > > > > > > > -- > > > > Kent Fitzgerald > > > > > > > > > > > > _______________________________________________ > > > > oae-dev mailing list > > > > [email protected] > > > <mailto:[email protected]> > > > <mailto:[email protected] > > > <mailto:[email protected]>> > > > > http://collab.sakaiproject.org/mailman/listinfo/oae-dev > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > oae-dev mailing list > > > > [email protected] > > > <mailto:[email protected]> > > > > http://collab.sakaiproject.org/mailman/listinfo/oae-dev > > > _______________________________________________ > > > oae-dev mailing list > > > [email protected] > > > <mailto:[email protected]> > > > http://collab.sakaiproject.org/mailman/listinfo/oae-dev > > > > > > > > _______________________________________________ > > oae-dev mailing list > > [email protected] > > http://collab.sakaiproject.org/mailman/listinfo/oae-dev > > -- > D. Stuart Freeman > Georgia Institute of Technology > _______________________________________________ > oae-dev mailing list > [email protected] > http://collab.sakaiproject.org/mailman/listinfo/oae-dev -- D. Stuart Freeman Georgia Institute of Technology
signature.asc
Description: Digital signature
_______________________________________________ oae-dev mailing list [email protected] http://collab.sakaiproject.org/mailman/listinfo/oae-dev
