From: "Tu, Lijuan" <lijuan.tu@intel.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: "web@dpdk.org" <web@dpdk.org>, "dts@dpdk.org" <dts@dpdk.org>
Subject: Re: [dpdk-web] DTS documentation update on dpdk.org
Date: Fri, 14 Dec 2018 01:30:28 +0000 [thread overview]
Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0B9E1269@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1837670.VC7d8yYS2V@xps>
Thanks for your help.
I will take care of branches and tags as well as version in DTS.
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Thursday, December 13, 2018 9:41 PM
> To: Tu, Lijuan <lijuan.tu@intel.com>
> Cc: web@dpdk.org; dts@dpdk.org
> Subject: Re: DTS documentation update on dpdk.org
>
> Hi,
>
> The error is because of the mess with branches and tags in DTS.
> I cannot manage to understand how branches are used, so I assume you
> don't want to update the docs for the old branches.
> I have updated the script to take only tags into account, without updating
> any oldest version.
>
> I ran it and it works.
> But the doc is still showing a version number 17.08.0 because you never
> updated the file version.py in DTS.
>
>
> 11/12/2018 12:22, Tu, Lijuan:
> > Hi Thomas:
> >
> > I removed the previous 18.11, and created the new tag v18.11 using " git
> tag -am dts-18.11 v18.11"
> > And then push to remote: git push origin v18.11,
> > Got an error: remote: make: *** [update-dts] Error 1
> > I don't know what does it mean, but I didn't find the dts document
> updated.
> > Could you help figure it out?
> >
> > Below is the log when I ran "git push origin v18.11"
> > Counting objects: 1, done.
> > Writing objects: 100% (1/1), 160 bytes | 160.00 KiB/s, done.
> > Total 1 (delta 0), reused 0 (delta 0)
> > remote: create 18.11
> > remote: generating 18.11 documentation...
> > remote: HEAD is now at 3831700... tests/nic_single_core_perf: add
> > result into report
> > remote: From /srv/git/tools/dts
> > remote: 6e3da1b..02c9d57 master -> origin/master
> > remote: make: *** [update-dts] Error 1 To dpdk.org:dts.git
> > * [new tag] v18.11 -> v18.11
> >
> > > -----Original Message-----
> > > From: Thomas Monjalon [mailto:thomas@monjalon.net]
> > > Sent: Tuesday, December 11, 2018 5:16 PM
> > > To: Tu, Lijuan <lijuan.tu@intel.com>
> > > Cc: web@dpdk.org; dts@dpdk.org
> > > Subject: Re: DTS documentation update on dpdk.org
> > >
> > > Hi,
> > >
> > > 11/12/2018 08:56, Tu, Lijuan:
> > > > Hi Thomas,
> > > >
> > > > Can I ask how it is to trigger the DTS document update on dpdk.org?
> > > >
> > > > I checked the doc build locally, and there is no build errors,
> > > > then I make the
> > > DTS tag using "git tag -a 18.11".
> > > >
> > > > I supposed the DTS document will be updated automatically, but
> > > > actually I
> > > find still the old document on web pages.
> > >
> > > The tag is expected to start with "v":
> > > git tag -am dts-18.11 v18.11
> > >
> > > Please try again with tag v18.11.
> > > Note: you can remove previous tag 18.11.
> > >
> > > My advice: use 18.11 as branch name and v18.11 as tag name.
> > >
> >
>
>
>
>
prev parent reply other threads:[~2018-12-14 1:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 7:56 Tu, Lijuan
2018-12-11 9:15 ` Thomas Monjalon
2018-12-11 11:22 ` Tu, Lijuan
2018-12-13 10:51 ` Tu, Lijuan
2018-12-13 13:40 ` Thomas Monjalon
2018-12-14 1:30 ` Tu, Lijuan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8CE3E05A3F976642AAB0F4675D0AD20E0B9E1269@SHSMSX101.ccr.corp.intel.com \
--to=lijuan.tu@intel.com \
--cc=dts@dpdk.org \
--cc=thomas@monjalon.net \
--cc=web@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).