[PATCH] cirrus.yml: Replace the hard-coded python-sphinx version with the generic one

Thomas Huth posted 1 patch 3 years, 4 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210111103410.144797-1-thuth@redhat.com
Maintainers: Li-Wen Hsu <lwhsu@freebsd.org>, Ed Maste <emaste@freebsd.org>
.cirrus.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
[PATCH] cirrus.yml: Replace the hard-coded python-sphinx version with the generic one
Posted by Thomas Huth 3 years, 4 months ago
The mingw-w64-x86_64-python-sphinx-2.3.1 package has been removed from
the server, so the windows_msys2_task is currently failing. Replace the
old version with the current generic one to fix the issue (the current
version seems to work fine now, too).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Successful run (with sphinx building the docs) can be seen here:
 https://cirrus-ci.com/task/6568987054047232

 .cirrus.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 3907e036da..886addedd3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -117,12 +117,8 @@ windows_msys2_task:
           mingw-w64-x86_64-curl \
           mingw-w64-x86_64-gnutls \
           mingw-w64-x86_64-libnfs \
+          mingw-w64-x86_64-python-sphinx
           "
-        bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND `
-          https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz `
-          C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
-        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U /c/tools/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz"
-        del C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
         C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg/*"
         cd C:\tools\msys64
         echo "Start archive"
-- 
2.27.0


Re: [PATCH] cirrus.yml: Replace the hard-coded python-sphinx version with the generic one
Posted by Philippe Mathieu-Daudé 3 years, 4 months ago
On 1/11/21 11:34 AM, Thomas Huth wrote:
> The mingw-w64-x86_64-python-sphinx-2.3.1 package has been removed from
> the server, so the windows_msys2_task is currently failing. Replace the
> old version with the current generic one to fix the issue (the current
> version seems to work fine now, too).
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  Successful run (with sphinx building the docs) can be seen here:
>  https://cirrus-ci.com/task/6568987054047232
> 
>  .cirrus.yml | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>



Re: [PATCH] cirrus.yml: Replace the hard-coded python-sphinx version with the generic one
Posted by 罗勇刚 (Yonggang Luo) 3 years, 4 months ago
On Mon, Jan 11, 2021 at 6:34 PM Thomas Huth <thuth@redhat.com> wrote:
>
> The mingw-w64-x86_64-python-sphinx-2.3.1 package has been removed from
> the server, so the windows_msys2_task is currently failing. Replace the
> old version with the current generic one to fix the issue (the current
> version seems to work fine now, too).
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  Successful run (with sphinx building the docs) can be seen here:
>  https://cirrus-ci.com/task/6568987054047232
>
>  .cirrus.yml | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 3907e036da..886addedd3 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -117,12 +117,8 @@ windows_msys2_task:
>            mingw-w64-x86_64-curl \
>            mingw-w64-x86_64-gnutls \
>            mingw-w64-x86_64-libnfs \
> +          mingw-w64-x86_64-python-sphinx
>            "
> -        bitsadmin /transfer msys_download /dynamic /download /priority
FOREGROUND `
> -
https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
`
> -          C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
> -        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U
/c/tools/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz"
> -        del
C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
>          C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf
/var/cache/pacman/pkg/*"
>          cd C:\tools\msys64
>          echo "Start archive"
> --
> 2.27.0
>
Hi, I've done that in my previous patch and queued by Paolo Bonzini 4 days,
8 hours ago

https://patchew.org/QEMU/20210107101919.80-1-luoyonggang@gmail.com/
--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
Re: [PATCH] cirrus.yml: Replace the hard-coded python-sphinx version with the generic one
Posted by Thomas Huth 3 years, 4 months ago
On 11/01/2021 21.16, 罗勇刚(Yonggang Luo) wrote:
> 
> 
> On Mon, Jan 11, 2021 at 6:34 PM Thomas Huth <thuth@redhat.com 
> <mailto:thuth@redhat.com>> wrote:
>  >
>  > The mingw-w64-x86_64-python-sphinx-2.3.1 package has been removed from
>  > the server, so the windows_msys2_task is currently failing. Replace the
>  > old version with the current generic one to fix the issue (the current
>  > version seems to work fine now, too).
>  >
>  > Signed-off-by: Thomas Huth <thuth@redhat.com <mailto:thuth@redhat.com>>
>  > ---
>  >  Successful run (with sphinx building the docs) can be seen here:
>  > https://cirrus-ci.com/task/6568987054047232 
> <https://cirrus-ci.com/task/6568987054047232>
>  >
>  >  .cirrus.yml | 6 +-----
>  >  1 file changed, 1 insertion(+), 5 deletions(-)
>  >
>  > diff --git a/.cirrus.yml b/.cirrus.yml
>  > index 3907e036da..886addedd3 100644
>  > --- a/.cirrus.yml
>  > +++ b/.cirrus.yml
>  > @@ -117,12 +117,8 @@ windows_msys2_task:
>  >            mingw-w64-x86_64-curl \
>  >            mingw-w64-x86_64-gnutls \
>  >            mingw-w64-x86_64-libnfs \
>  > +          mingw-w64-x86_64-python-sphinx
>  >            "
>  > -        bitsadmin /transfer msys_download /dynamic /download /priority 
> FOREGROUND `
>  > - 
> https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz 
> <https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz> 
> `
>  > -          C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
>  > -        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U 
> /c/tools/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz"
>  > -        del C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
>  >          C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf 
> /var/cache/pacman/pkg/*"
>  >          cd C:\tools\msys64
>  >          echo "Start archive"
>  > --
>  > 2.27.0
>  >
> Hi, I've done that in my previous patch and queued by Paolo Bonzini 4 days, 
> 8 hours ago
> 
> https://patchew.org/QEMU/20210107101919.80-1-luoyonggang@gmail.com/ 

Ah, alright, then please ignore my patch here!

  Thanks,
   Thomas