[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/22] cirrus: Enable doc build on msys2/mingw
From: |
Paolo Bonzini |
Subject: |
[PULL 19/22] cirrus: Enable doc build on msys2/mingw |
Date: |
Fri, 16 Oct 2020 07:48:11 -0400 |
From: Yonggang Luo <luoyonggang@gmail.com>
Currently rST depends on old version sphinx-2.x.
Install it by downloading it.
Remove the need of university mirror, the main repo are recovered.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201015220626.418-5-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.cirrus.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 396888fbd3..e099da0fec 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -76,7 +76,6 @@ windows_msys2_task:
((Get-Content -path
C:\tools\msys64\etc\\post-install\\07-pacman-key.post -Raw) -replace
'--refresh-keys', '--version') | Set-Content -Path
C:\tools\msys64\etc\\post-install\\07-pacman-key.post
C:\tools\msys64\usr\bin\bash.exe -lc "sed -i
's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf"
C:\tools\msys64\usr\bin\bash.exe -lc "export"
- C:\tools\msys64\usr\bin\bash.exe -lc "grep -rl 'repo.msys2.org/'
/etc/pacman.d/mirrorlist.* | xargs sed -i
's/repo.msys2.org\//mirrors.tuna.tsinghua.edu.cn\/msys2\//g'"
C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Sy
echo Y | C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Suu
--overwrite=*
taskkill /F /FI "MODULES eq msys-2.0.dll"
@@ -111,6 +110,11 @@ windows_msys2_task:
mingw-w64-x86_64-curl \
mingw-w64-x86_64-gnutls \
"
+ 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.26.2
- [PULL 12/22] meson.build: don't condition iconv detection on library detection, (continued)
- [PULL 12/22] meson.build: don't condition iconv detection on library detection, Paolo Bonzini, 2020/10/16
- [PULL 09/22] build: cleanups to Makefile, Paolo Bonzini, 2020/10/16
- [PULL 15/22] meson: Only install icons and qemu.desktop if have_system, Paolo Bonzini, 2020/10/16
- [PULL 16/22] docs: Fix Sphinx configuration for msys2/mingw, Paolo Bonzini, 2020/10/16
- [PULL 18/22] meson: Move the detection logic for sphinx to meson, Paolo Bonzini, 2020/10/16
- [PULL 10/22] build: replace ninjatool with ninja, Paolo Bonzini, 2020/10/16
- [PULL 20/22] fuzz: Disable QEMU's SIG{INT,HUP,TERM} handlers, Paolo Bonzini, 2020/10/16
- [PULL 21/22] hax: unbreak accelerator cpu code after cpus.c split, Paolo Bonzini, 2020/10/16
- [PULL 19/22] cirrus: Enable doc build on msys2/mingw,
Paolo Bonzini <=
- [PULL 17/22] meson: move SPHINX_ARGS references within "if build_docs", Paolo Bonzini, 2020/10/16
- [PULL 22/22] ci: include configure and meson logs in all jobs if configure fails, Paolo Bonzini, 2020/10/16