Skip to contentSkip to conversation

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

PATCH In review Thomas Huth 3 participants 4 messages Jan 11, 2021 – Jan 12, 2021

lore
Share & tools
lore
#0 lore raw

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

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).

---
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(-)
.cirrus.yml +1 -5
index 3907e036da..886addedd3 100644
@@ -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"
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Thomas Huth

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).

Quoted 7 lines

---
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(-)
#2 lore raw
In reply to Thomas Huth
Quoted 19 lines · Thomas Huth

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).

---
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(-)
.cirrus.yml +0 -0
index 3907e036da..886addedd3 100644

.cirrus.yml windows_msys2_task: · line 121

Quoted 6 lines
.cirrus.yml +1 -1
@@ -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 `

.cirrus.yml windows_msys2_task: · line 122

Quoted 1 line
.cirrus.yml +0 -1
-

https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
`

.cirrus.yml windows_msys2_task: · line 124

Quoted 2 lines
.cirrus.yml +0 -2
-          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"

.cirrus.yml windows_msys2_task: · line 125

Quoted 1 line
.cirrus.yml +0 -1
-        del

C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz

.cirrus.yml windows_msys2_task: · line 122

Quoted 1 line
.cirrus.yml +0 -0
         C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf

/var/cache/pacman/pkg/*"

Quoted 5 lines
.cirrus.yml +0 -1
         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/[email protected]/
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo

#3 lore raw
Quoted 38 lines · 罗勇刚(Yonggang Luo)
Quoted 10 lines · On Mon, Jan 11, 2021 at 6:34 PM Thomas Huth <[email protected]…

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 <[email protected] <mailto:[email protected]>>

---
 Successful run (with sphinx building the docs) can be seen here:
https://cirrus-ci.com/task/6568987054047232

<https://cirrus-ci.com/task/6568987054047232>

Quoted 13 lines

 .cirrus.yml | 6 +-----

 1 file changed, 1 insertion(+), 5 deletions(-)
.cirrus.yml +1 -0
index 3907e036da..886addedd3 100644
@@ -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
Quoted 2 lines

           "
-        bitsadmin /transfer msys_download /dynamic /download /priority

FOREGROUND `

Quoted 1 line

-

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> `

Quoted 2 lines

-          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"

Quoted 2 lines

-        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/*"

Quoted 8 lines
Quoted 5 lines

         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/[email protected]/

Ah, alright, then please ignore my patch here!

Thanks,
Thomas