Re: [Openocd-development] Tags
It's an accident normally we are supposed to 0.5.0-rc2xxx I'm currently genereating the release sorry for the delay I was busy on the kernel merge window np! The OpenOCD's maintainers official policy is not to overlap with the kernel merge window! :-) -- Øyvind Harboe - Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/ ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On 08:56 Fri 05 Aug , Øyvind Harboe wrote: When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) It's an accident normally we are supposed to 0.5.0-rc2xxx I'm currently genereating the release sorry for the delay I was busy on the kernel merge window I'll push in few hours Best Regards, J. ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
[Openocd-development] Tags
When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) -- Øyvind Harboe - Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/ ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On 5 August 2011 07:56, Øyvind Harboe oyvind.har...@zylin.com wrote: When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) Release tags are annotated, and so take priority with git describe. Cheers Spen ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On Fri, Aug 5, 2011 at 8:56 AM, Øyvind Harboe oyvind.har...@zylin.comwrote: When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) As I posted several times already, it's because the release procedure wasn't followed in creating the rc tags and tarballs. The following basic steps should be followed for a proper rc3 release. There are more things to take in consideration, for example making sure the NEWS file is properly updated and so on. Check the release manual that Zach and David wrote. 1. Manually fix, commit and push the skipped version bumps in configure.in: -AC_INIT([openocd], [0.5.0-dev], +AC_INIT([openocd], [0.5.0-rc3-dev], 2. do a fresh git clone of openocd 3. run tools/release.sh --next rc release 4. verify and publish archives/* 5. merge v0.5.0-rc4-dev into master and push it After this, git describe correctly reflects that we're in rc phase: v0.5.0-rc3-1-gbcded6a And version strings should be correct (didn't test): 0.5.0-rc3 if built from tarball, 0.5.0-rc4-dev if built from git HEAD. I think we really need to do this, like, right now, then wait for feedback from people building the released rc3 tarballs (a week tops), then do the final 0.5.0 release. No patches accepted except build and packaging fixes after rc3 is out. Final 0.5.0 release is very similar: 1. do a fresh git clone of openocd 2. run tools/release.sh --next minor --final release 3. verify and publish archives/* 4. merge v0.6.0-dev into master and push it /Andreas ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On 5 August 2011 09:58, Andreas Fritiofson andreas.fritiof...@gmail.com wrote: On Fri, Aug 5, 2011 at 8:56 AM, Øyvind Harboe oyvind.har...@zylin.com wrote: When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) As I posted several times already, it's because the release procedure wasn't followed in creating the rc tags and tarballs. The following basic steps should be followed for a proper rc3 release. There are more things to take in consideration, for example making sure the NEWS file is properly updated and so on. Check the release manual that Zach and David wrote. 1. Manually fix, commit and push the skipped version bumps in configure.in: -AC_INIT([openocd], [0.5.0-dev], +AC_INIT([openocd], [0.5.0-rc3-dev], 2. do a fresh git clone of openocd 3. run tools/release.sh --next rc release 4. verify and publish archives/* 5. merge v0.5.0-rc4-dev into master and push it After this, git describe correctly reflects that we're in rc phase: v0.5.0-rc3-1-gbcded6a And version strings should be correct (didn't test): 0.5.0-rc3 if built from tarball, 0.5.0-rc4-dev if built from git HEAD. I think we really need to do this, like, right now, then wait for feedback from people building the released rc3 tarballs (a week tops), then do the final 0.5.0 release. No patches accepted except build and packaging fixes after rc3 is out. Final 0.5.0 release is very similar: 1. do a fresh git clone of openocd 2. run tools/release.sh --next minor --final release 3. verify and publish archives/* 4. merge v0.6.0-dev into master and push it /Andreas I will agree that the release process has not been followed with regards to tarballs. However this is not the cause of Øyvind query - please see my previous email. Cheers Spen ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On Fri, Aug 5, 2011 at 11:02 AM, Spencer Oliver s...@spen-soft.co.ukwrote: On 5 August 2011 09:58, Andreas Fritiofson andreas.fritiof...@gmail.com wrote: On Fri, Aug 5, 2011 at 8:56 AM, Øyvind Harboe oyvind.har...@zylin.com wrote: When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) As I posted several times already, it's because the release procedure wasn't followed in creating the rc tags and tarballs. I will agree that the release process has not been followed with regards to tarballs. However this is not the cause of Øyvind query - please see my previous email. Release tags are annotated, and so take priority with git describe. Ok, but if the release script would have been used, the v0.5.0-rc* tags would have been annotated. And they really should be, right? That's what the script does, the 0.4.0 and 0.3.0 rc tags were annotated, and it corresponds with Øyvind's initial expectation of a v0.5.0-rc2- output from git describe. /Andreas ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On 5 August 2011 10:19, Andreas Fritiofson andreas.fritiof...@gmail.com wrote: On Fri, Aug 5, 2011 at 11:02 AM, Spencer Oliver s...@spen-soft.co.uk wrote: On 5 August 2011 09:58, Andreas Fritiofson andreas.fritiof...@gmail.com wrote: On Fri, Aug 5, 2011 at 8:56 AM, Øyvind Harboe oyvind.har...@zylin.com wrote: When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) As I posted several times already, it's because the release procedure wasn't followed in creating the rc tags and tarballs. I will agree that the release process has not been followed with regards to tarballs. However this is not the cause of Øyvind query - please see my previous email. Release tags are annotated, and so take priority with git describe. Ok, but if the release script would have been used, the v0.5.0-rc* tags would have been annotated. And they really should be, right? That's what the script does, the 0.4.0 and 0.3.0 rc tags were annotated, and it corresponds with Øyvind's initial expectation of a v0.5.0-rc2- output from git describe. /Andreas Release tags are annotated, but not rc tags Spen ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On 5 August 2011 10:26, Spencer Oliver s...@spen-soft.co.uk wrote: On 5 August 2011 10:19, Andreas Fritiofson andreas.fritiof...@gmail.com wrote: On Fri, Aug 5, 2011 at 11:02 AM, Spencer Oliver s...@spen-soft.co.uk wrote: On 5 August 2011 09:58, Andreas Fritiofson andreas.fritiof...@gmail.com wrote: On Fri, Aug 5, 2011 at 8:56 AM, Øyvind Harboe oyvind.har...@zylin.com wrote: When I run git describe now I get v0.4.0-973-g0d7a948 rather than a v0.5.0-rc2-. Is that intentional? I think it's nice that we stick to v0.4.0- until v0.5.0- goes out of the door. I have no particular opinion, except it should be by choice and not by accident :-) As I posted several times already, it's because the release procedure wasn't followed in creating the rc tags and tarballs. I will agree that the release process has not been followed with regards to tarballs. However this is not the cause of Øyvind query - please see my previous email. Release tags are annotated, and so take priority with git describe. Ok, but if the release script would have been used, the v0.5.0-rc* tags would have been annotated. And they really should be, right? That's what the script does, the 0.4.0 and 0.3.0 rc tags were annotated, and it corresponds with Øyvind's initial expectation of a v0.5.0-rc2- output from git describe. /Andreas Release tags are annotated, but not rc tags use git describe --tags to take all tags (including soft) into account. Spen ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
Release tags are annotated, but not rc tags This sounds like a good policy to me. -- Øyvind Harboe - Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/ ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On Fri, Aug 5, 2011 at 11:26 AM, Spencer Oliver s...@spen-soft.co.ukwrote: Release tags are annotated, but not rc tags Oh, but they are, or am I completely oblivious of git tags (quite possible)? $ git checkout v0.4.0-rc2~2 $ git describe v0.4.0-rc1-193-g747a607 http://repo.or.cz/w/openocd.git/tag/cd8ad2e961d3476ddfad3353390ce99a4872bdf1 http://repo.or.cz/w/openocd.git/tag/f74fdc5e4afc94b65cba4b4c357f0e67cc9d185a And why shouldn't they be? /Andreas ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On 5 August 2011 10:39, Andreas Fritiofson andreas.fritiof...@gmail.com wrote: On Fri, Aug 5, 2011 at 11:26 AM, Spencer Oliver s...@spen-soft.co.uk wrote: Release tags are annotated, but not rc tags Oh, but they are, or am I completely oblivious of git tags (quite possible)? $ git checkout v0.4.0-rc2~2 $ git describe v0.4.0-rc1-193-g747a607 http://repo.or.cz/w/openocd.git/tag/cd8ad2e961d3476ddfad3353390ce99a4872bdf1 http://repo.or.cz/w/openocd.git/tag/f74fdc5e4afc94b65cba4b4c357f0e67cc9d185a And why shouldn't they be? /Andreas No sorry you are correct - the rc tags should be annotated aswell. The current 0.5.0-rc* are soft tags not annotated, which is incorrect. Spen ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
And why shouldn't they be? To me it's a matter of taste if rc candidate tags are annotated or not. I'm good with either choice. I was just curious as to whether it was accidental or intentional. Looks like it was accidental in that we really should be using the release procedure and when we do, then we get the annotated rc tags. -- Øyvind Harboe - Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/ ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
Re: [Openocd-development] Tags
On 5 August 2011 11:07, Øyvind Harboe oyvind.har...@zylin.com wrote: And why shouldn't they be? To me it's a matter of taste if rc candidate tags are annotated or not. I'm good with either choice. I was just curious as to whether it was accidental or intentional. Looks like it was accidental in that we really should be using the release procedure and when we do, then we get the annotated rc tags. guessing by accident. If we had used the release.sh script this would not have happened. Spen ___ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
