| Message ID | 20201008201353.465-3-luoyonggang@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fixes docs building on msys2/mingw | expand |
On Fri, Oct 09, 2020 at 04:13:53AM +0800, Yonggang Luo wrote: > Currently rST depends on old version sphinx-2.x. > Install it by downloading it. > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > .cirrus.yml | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/.cirrus.yml b/.cirrus.yml > index 77cfd99afe..b1725bd0c1 100644 > --- a/.cirrus.yml > +++ b/.cirrus.yml > @@ -73,6 +73,7 @@ windows_msys2_task: > bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe C:\tools\base.exe > Write-Output "Download time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)" > C:\tools\base.exe -y > + del C:\tools\base.exe > ((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" > @@ -112,6 +113,13 @@ windows_msys2_task: > mingw-w64-x86_64-gnutls \ > mingw-w64-x86_64-libnfs \ > " > + bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND ` > + https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz ` Relying on some random university mirror site is not a nice approach IMHO. Why isn't this using the official msys2 site like the other packages ? > + 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" Regards, Daniel
diff --git a/.cirrus.yml b/.cirrus.yml index 77cfd99afe..b1725bd0c1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -73,6 +73,7 @@ windows_msys2_task: bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe C:\tools\base.exe Write-Output "Download time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)" C:\tools\base.exe -y + del C:\tools\base.exe ((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" @@ -112,6 +113,13 @@ windows_msys2_task: mingw-w64-x86_64-gnutls \ mingw-w64-x86_64-libnfs \ " + bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND ` + https://mirrors.tuna.tsinghua.edu.cn/msys2/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"
Currently rST depends on old version sphinx-2.x. Install it by downloading it. Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- .cirrus.yml | 8 ++++++++ 1 file changed, 8 insertions(+)