| Message ID | 20200312121106.5172-1-hegdevasant@linux.vnet.ibm.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [trivial] make_version: Use --tags option | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (2700092e09adc8f3c2d578878c1a98cb44b9863d) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
On Thu, Mar 12, 2020, at 5:11 AM, Vasant Hegde wrote: > By default (without --all or --tags) git describe only shows annotated > tags. Lets add --tags option so that we generate version based on latest > released version. This would mean that not signed tags could be used, which is probably not ideal?
On 3/12/20 10:55 PM, Stewart Smith wrote: > On Thu, Mar 12, 2020, at 5:11 AM, Vasant Hegde wrote: >> By default (without --all or --tags) git describe only shows annotated >> tags. Lets add --tags option so that we generate version based on latest >> released version. > > This would mean that not signed tags could be used, which is probably not ideal? Stewart, Sorry. I should have expanded the description. I'd prefer signed tags. But our v6.5 is not signed. So when we build skiboot its generating version as v6.4-xx .. its bit confusing. so I added `--tags` as workaround -Vasant
On Fri, Mar 13, 2020 at 4:56 PM Vasant Hegde <hegdevasant@linux.vnet.ibm.com> wrote: > > On 3/12/20 10:55 PM, Stewart Smith wrote: > > On Thu, Mar 12, 2020, at 5:11 AM, Vasant Hegde wrote: > >> By default (without --all or --tags) git describe only shows annotated > >> tags. Lets add --tags option so that we generate version based on latest > >> released version. > > > > This would mean that not signed tags could be used, which is probably not ideal? > > Stewart, > > Sorry. I should have expanded the description. > > I'd prefer signed tags. But our v6.5 is not signed. So when we build skiboot its > generating I think I re-pushed it as a signed tag at some point. Try delete it with git tag -d v6.5 and fetch it again. > version as v6.4-xx .. its bit confusing. so I added `--tags` as workaround > > -Vasant > > > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot
On 3/23/20 12:37 PM, Oliver O'Halloran wrote: > On Fri, Mar 13, 2020 at 4:56 PM Vasant Hegde > <hegdevasant@linux.vnet.ibm.com> wrote: >> >> On 3/12/20 10:55 PM, Stewart Smith wrote: >>> On Thu, Mar 12, 2020, at 5:11 AM, Vasant Hegde wrote: >>>> By default (without --all or --tags) git describe only shows annotated >>>> tags. Lets add --tags option so that we generate version based on latest >>>> released version. >>> >>> This would mean that not signed tags could be used, which is probably not ideal? >> >> Stewart, >> >> Sorry. I should have expanded the description. >> >> I'd prefer signed tags. But our v6.5 is not signed. So when we build skiboot its >> generating > > I think I re-pushed it as a signed tag at some point. Try delete it > with git tag -d v6.5 and fetch it again. This worked for me. Thanks! We can ignore this patch. -Vasant
diff --git a/make_version.sh b/make_version.sh index 59fe01c72..fba5ae608 100755 --- a/make_version.sh +++ b/make_version.sh @@ -17,7 +17,7 @@ then version=$(git describe --exact-match 2>/dev/null) if [ -z "$version" ]; then - version=$(git describe 2>/dev/null) + version=$(git describe --tags 2>/dev/null) fi if [ -z "$version" ]; then
By default (without --all or --tags) git describe only shows annotated tags. Lets add --tags option so that we generate version based on latest released version. Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> --- make_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)