mbox series

[v7,0/4] Improve cirrus msys2

Message ID 20201012233740.190-1-luoyonggang@gmail.com
Headers show
Series Improve cirrus msys2 | expand

Message

罗勇刚(Yonggang Luo) Oct. 12, 2020, 11:37 p.m. UTC
Fixes the broken msys2/mingw ci and speed it up.

V6-V7
* cirrus: Enable doc build on msys2/mingw
* docs: Fixes build docs on msys2/mingw
* gitignore: ignore a bit more
* scripts: Convert qemu-version.sh to qemu-version.py

V5-V6
Remove the university mirror, the main repo are back.
rename to setup_script.
Add fixes for msys2/mingw rST document fixes

V4-V5
Now the cache are usefull by using 7zip to archive msys64
Saved about 18min, compare
https://cirrus-ci.com/task/5093551157542912
https://cirrus-ci.com/task/6177196538593280

V3-V4
Using cirrus cache to speed up msys2 ci instead of downloading archive file

V2-V3
Add one more patch:
cirrus: msys2/mingw speed is up, add excluded target back
Do not build sphinx on windows, that's failing
set the number of parallel count to fixed number 8

V1-V2
Resolve the cirrus conflict

Yonggang Luo (4):
  scripts: Convert qemu-version.sh to qemu-version.py
  gitignore: ignore a bit more
  docs: Fixes build docs on msys2/mingw
  cirrus: Enable doc build on msys2/mingw

 .cirrus.yml                   |  6 +++++-
 .gitignore                    |  4 +++-
 docs/conf.py                  |  2 +-
 docs/sphinx/kerneldoc.py      |  2 +-
 meson.build                   |  2 +-
 scripts/qemu-version.py       | 37 +++++++++++++++++++++++++++++++++++
 scripts/qemu-version.sh       | 25 -----------------------
 scripts/rst-sanitize.py       | 21 ++++++++++++++++++++
 tests/qapi-schema/meson.build |  5 +++--
 9 files changed, 72 insertions(+), 32 deletions(-)
 create mode 100644 scripts/qemu-version.py
 delete mode 100755 scripts/qemu-version.sh
 create mode 100644 scripts/rst-sanitize.py

-- 
2.28.0.windows.1

Comments

Philippe Mathieu-Daudé Oct. 13, 2020, 8:38 a.m. UTC | #1
On 10/13/20 1:37 AM, Yonggang Luo wrote:
> Enable the creating multiple build directory at the source root.
> Ignore /meson/ and /roms/ for better search experience.
> 
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>   .gitignore | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore
> index b32bca1315..f78ee9f297 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,5 +1,5 @@
>   /GNUmakefile
> -/build/
> +/build*/
>   *.pyc
>   .sdk
>   .stgit-*
> @@ -10,3 +10,5 @@ TAGS
>   *~
>   *.ast_raw
>   *.depend_raw
> +/meson/
> +/roms/**/*

Why?
罗勇刚(Yonggang Luo) Oct. 13, 2020, 8:53 a.m. UTC | #2
On Tue, Oct 13, 2020 at 4:38 PM Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:
>
> On 10/13/20 1:37 AM, Yonggang Luo wrote:
> > Enable the creating multiple build directory at the source root.
> > Ignore /meson/ and /roms/ for better search experience.
> >
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> >   .gitignore | 4 +++-
> >   1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/.gitignore b/.gitignore
> > index b32bca1315..f78ee9f297 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -1,5 +1,5 @@
> >   /GNUmakefile
> > -/build/
> > +/build*/
> >   *.pyc
> >   .sdk
> >   .stgit-*
> > @@ -10,3 +10,5 @@ TAGS
> >   *~
> >   *.ast_raw
> >   *.depend_raw
> > +/meson/
> > +/roms/**/*
>
> Why?
As I said, help for searching tool ignore it, meson and roms are thirdparty
packages.
>


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
<div dir="ltr"><br><br>On Tue, Oct 13, 2020 at 4:38 PM Philippe Mathieu-Daudé &lt;<a href="mailto:philmd@redhat.com">philmd@redhat.com</a>&gt; wrote:<br>&gt;<br>&gt; On 10/13/20 1:37 AM, Yonggang Luo wrote:<br>&gt; &gt; Enable the creating multiple build directory at the source root.<br>&gt; &gt; Ignore /meson/ and /roms/ for better search experience.<br>&gt; &gt;<br>&gt; &gt; Signed-off-by: Yonggang Luo &lt;<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>&gt;<br>&gt; &gt; ---<br>&gt; &gt;   .gitignore | 4 +++-<br>&gt; &gt;   1 file changed, 3 insertions(+), 1 deletion(-)<br>&gt; &gt;<br>&gt; &gt; diff --git a/.gitignore b/.gitignore<br>&gt; &gt; index b32bca1315..f78ee9f297 100644<br>&gt; &gt; --- a/.gitignore<br>&gt; &gt; +++ b/.gitignore<br>&gt; &gt; @@ -1,5 +1,5 @@<br>&gt; &gt;   /GNUmakefile<br>&gt; &gt; -/build/<br>&gt; &gt; +/build*/<br>&gt; &gt;   *.pyc<br>&gt; &gt;   .sdk<br>&gt; &gt;   .stgit-*<br>&gt; &gt; @@ -10,3 +10,5 @@ TAGS<br>&gt; &gt;   *~<br>&gt; &gt;   *.ast_raw<br>&gt; &gt;   *.depend_raw<br>&gt; &gt; +/meson/<br>&gt; &gt; +/roms/**/*<br>&gt;<br>&gt; Why?<br>As I said, help for searching tool ignore it, meson and roms are thirdparty packages.<br>&gt;<br><br><br>--<br>         此致<br>礼<br>罗勇刚<br>Yours<br>    sincerely,<br>Yonggang Luo<br></div>
Thomas Huth Oct. 13, 2020, 9:01 a.m. UTC | #3
On 13/10/2020 10.53, 罗勇刚(Yonggang Luo) wrote:
> 
> 
> On Tue, Oct 13, 2020 at 4:38 PM Philippe Mathieu-Daudé <philmd@redhat.com
> <mailto:philmd@redhat.com>> wrote:
>>
>> On 10/13/20 1:37 AM, Yonggang Luo wrote:
>> > Enable the creating multiple build directory at the source root.
>> > Ignore /meson/ and /roms/ for better search experience.
>> >
>> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> <mailto:luoyonggang@gmail.com>>
>> > ---
>> >   .gitignore | 4 +++-
>> >   1 file changed, 3 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/.gitignore b/.gitignore
>> > index b32bca1315..f78ee9f297 100644
>> > --- a/.gitignore
>> > +++ b/.gitignore
>> > @@ -1,5 +1,5 @@
>> >   /GNUmakefile
>> > -/build/
>> > +/build*/

The naming of your private build directories is IMHO something that should
not be part of the public .gitignore file. I think you can use your
~/.gitignore file for that.

>> >   *.pyc
>> >   .sdk
>> >   .stgit-*
>> > @@ -10,3 +10,5 @@ TAGS
>> >   *~
>> >   *.ast_raw
>> >   *.depend_raw
>> > +/meson/
>> > +/roms/**/*
>>
>> Why?
> As I said, help for searching tool ignore it, meson and roms are thirdparty
> packages.

Hmm, but "git status" should still show whether there are modifications in
the subdirectories, so IMHO this should not be ignored?

 Thomas
罗勇刚(Yonggang Luo) Oct. 13, 2020, 9:23 a.m. UTC | #4
On Tue, Oct 13, 2020 at 5:02 PM Thomas Huth <thuth@redhat.com> wrote:
>
> On 13/10/2020 10.53, 罗勇刚(Yonggang Luo) wrote:
> >
> >
> > On Tue, Oct 13, 2020 at 4:38 PM Philippe Mathieu-Daudé <
philmd@redhat.com
> > <mailto:philmd@redhat.com>> wrote:
> >>
> >> On 10/13/20 1:37 AM, Yonggang Luo wrote:
> >> > Enable the creating multiple build directory at the source root.
> >> > Ignore /meson/ and /roms/ for better search experience.
> >> >
> >> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> > <mailto:luoyonggang@gmail.com>>
> >> > ---
> >> >   .gitignore | 4 +++-
> >> >   1 file changed, 3 insertions(+), 1 deletion(-)
> >> >
> >> > diff --git a/.gitignore b/.gitignore
> >> > index b32bca1315..f78ee9f297 100644
> >> > --- a/.gitignore
> >> > +++ b/.gitignore
> >> > @@ -1,5 +1,5 @@
> >> >   /GNUmakefile
> >> > -/build/
> >> > +/build*/
>
> The naming of your private build directories is IMHO something that should
> not be part of the public .gitignore file. I think you can use your
> ~/.gitignore file for that.
>
> >> >   *.pyc
> >> >   .sdk
> >> >   .stgit-*
> >> > @@ -10,3 +10,5 @@ TAGS
> >> >   *~
> >> >   *.ast_raw
> >> >   *.depend_raw
> >> > +/meson/
> >> > +/roms/**/*
> >>
> >> Why?
> > As I said, help for searching tool ignore it, meson and roms are
thirdparty
> > packages.
>
> Hmm, but "git status" should still show whether there are modifications in
> the subdirectories, so IMHO this should not be ignored?
Yeap, it's doens't affect git, just affect search tools. If this is
improper, skip it, I can use it locally
>
>  Thomas
>


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
<div dir="ltr"><br><br>On Tue, Oct 13, 2020 at 5:02 PM Thomas Huth &lt;<a href="mailto:thuth@redhat.com">thuth@redhat.com</a>&gt; wrote:<br>&gt;<br>&gt; On 13/10/2020 10.53, 罗勇刚(Yonggang Luo) wrote:<br>&gt; &gt;<br>&gt; &gt;<br>&gt; &gt; On Tue, Oct 13, 2020 at 4:38 PM Philippe Mathieu-Daudé &lt;<a href="mailto:philmd@redhat.com">philmd@redhat.com</a><br>&gt; &gt; &lt;mailto:<a href="mailto:philmd@redhat.com">philmd@redhat.com</a>&gt;&gt; wrote:<br>&gt; &gt;&gt;<br>&gt; &gt;&gt; On 10/13/20 1:37 AM, Yonggang Luo wrote:<br>&gt; &gt;&gt; &gt; Enable the creating multiple build directory at the source root.<br>&gt; &gt;&gt; &gt; Ignore /meson/ and /roms/ for better search experience.<br>&gt; &gt;&gt; &gt;<br>&gt; &gt;&gt; &gt; Signed-off-by: Yonggang Luo &lt;<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a><br>&gt; &gt; &lt;mailto:<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>&gt;&gt;<br>&gt; &gt;&gt; &gt; ---<br>&gt; &gt;&gt; &gt;   .gitignore | 4 +++-<br>&gt; &gt;&gt; &gt;   1 file changed, 3 insertions(+), 1 deletion(-)<br>&gt; &gt;&gt; &gt;<br>&gt; &gt;&gt; &gt; diff --git a/.gitignore b/.gitignore<br>&gt; &gt;&gt; &gt; index b32bca1315..f78ee9f297 100644<br>&gt; &gt;&gt; &gt; --- a/.gitignore<br>&gt; &gt;&gt; &gt; +++ b/.gitignore<br>&gt; &gt;&gt; &gt; @@ -1,5 +1,5 @@<br>&gt; &gt;&gt; &gt;   /GNUmakefile<br>&gt; &gt;&gt; &gt; -/build/<br>&gt; &gt;&gt; &gt; +/build*/<br>&gt;<br>&gt; The naming of your private build directories is IMHO something that should<br>&gt; not be part of the public .gitignore file. I think you can use your<br>&gt; ~/.gitignore file for that.<br>&gt;<br>&gt; &gt;&gt; &gt;   *.pyc<br>&gt; &gt;&gt; &gt;   .sdk<br>&gt; &gt;&gt; &gt;   .stgit-*<br>&gt; &gt;&gt; &gt; @@ -10,3 +10,5 @@ TAGS<br>&gt; &gt;&gt; &gt;   *~<br>&gt; &gt;&gt; &gt;   *.ast_raw<br>&gt; &gt;&gt; &gt;   *.depend_raw<br>&gt; &gt;&gt; &gt; +/meson/<br>&gt; &gt;&gt; &gt; +/roms/**/*<br>&gt; &gt;&gt;<br>&gt; &gt;&gt; Why?<br>&gt; &gt; As I said, help for searching tool ignore it, meson and roms are thirdparty<br>&gt; &gt; packages.<br>&gt;<br>&gt; Hmm, but &quot;git status&quot; should still show whether there are modifications in<br>&gt; the subdirectories, so IMHO this should not be ignored?<div>Yeap, it&#39;s doens&#39;t affect git, just affect search tools. If this is improper, skip it, I can use it locally<br>&gt;<br>&gt;  Thomas<br>&gt;<br><br><br>--<br>         此致<br>礼<br>罗勇刚<br>Yours<br>    sincerely,<br>Yonggang Luo</div></div>