On 07/10/2020 16.52, Yonggang Luo wrote: > Use cache of cirrus caching msys2 > The install of msys2 are refer to https://github.com/msys2/setup-msys2 > The first time install msys2 would be time consuming, so increase timeout_in > to 90m > according to https://cirrus-ci.org/faq/#instance-timed-out > > Apply patch of > https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg00072.html > > Signed-off-by: Yonggang Luo <luoyongg...@gmail.com> > --- > .cirrus.yml | 110 +++++++++++++++++++++++++++++++--------------------- > 1 file changed, 66 insertions(+), 44 deletions(-) > > diff --git a/.cirrus.yml b/.cirrus.yml > index d58782ce67..a1145d0366 100644 > --- a/.cirrus.yml > +++ b/.cirrus.yml > @@ -46,64 +46,86 @@ macos_xcode_task: > - gmake check > > windows_msys2_task: > + timeout_in: 90m > windows_container: > - image: cirrusci/windowsservercore:cmake > + image: cirrusci/windowsservercore:2019 > os_version: 2019 > cpu: 8 > memory: 8G > env: > + CIRRUS_SHELL: powershell > MSYS: winsymlinks:nativestrict > MSYSTEM: MINGW64 > CHERE_INVOKING: 1 > printenv_script: > - - C:\tools\msys64\usr\bin\bash.exe -lc 'printenv' > + - choco install -y --no-progress 7zip
Since you've now removed the 'printenv' line, I think the section should maybe not be called "printenv_script" anymore, should it? Thomas
