From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"QEMU Trivial" <qemu-trivial@nongnu.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Yonggang Luo" <luoyonggang@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v2 2/2] cirrus: Fixing and speedup the msys2/mingw CI
Date: Wed, 7 Oct 2020 11:11:48 +0800 [thread overview]
Message-ID: <20201007031148.232-3-luoyonggang@gmail.com> (raw)
In-Reply-To: <20201007031148.232-1-luoyonggang@gmail.com>
Using a prepared https://github.com/lygstate/qemu/releases/download/v5.1.0/msys2-x86_64.tar.xz
for speed up the msys2/mingw prepare speed on the cirrus CI.
This file are generated by the msys2.docker
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
.cirrus.yml | 58 ++++++++++++++---------------------------------------
1 file changed, 15 insertions(+), 43 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index d58782ce67..6fd884db7a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -47,58 +47,30 @@ macos_xcode_task:
windows_msys2_task:
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'
install_script:
- - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools &&
- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
- - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools &&
- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
- - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools &&
- pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
- - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Sy"
+ - |
+ Write-Output $env:PATH
+ md C:\tools
+ $start_time = Get-Date
+ bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND https://github.com/lygstate/qemu/releases/download/v5.1.0/msys2-x86_64.tar.xz C:\tools\msys2-x86_64.tar.xz
+ Write-Output "Download time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"
+ $start_time = Get-Date
+ cd C:\tools
+ choco install -y --no-progress 7zip
+ cmd /C "7z x msys2-x86_64.tar.xz -so | 7z x -aoa -simsys2-x86_64.tar -ttar -omsys64"
+ Write-Output "Extract time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed
- bash pacman pacman-mirrors msys2-runtime"
- - taskkill /F /IM gpg-agent.exe
- - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Su"
- - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed
- base-devel
- git
- mingw-w64-x86_64-python
- mingw-w64-x86_64-python-setuptools
- mingw-w64-x86_64-toolchain
- mingw-w64-x86_64-capstone
- mingw-w64-x86_64-SDL2
- mingw-w64-x86_64-SDL2_image
- mingw-w64-x86_64-gtk3
- mingw-w64-x86_64-glib2
- mingw-w64-x86_64-ninja
- mingw-w64-x86_64-make
- mingw-w64-x86_64-lzo2
- mingw-w64-x86_64-zstd
- mingw-w64-x86_64-libjpeg-turbo
- mingw-w64-x86_64-pixman
- mingw-w64-x86_64-libgcrypt
- mingw-w64-x86_64-libpng
- mingw-w64-x86_64-libssh
- mingw-w64-x86_64-libxml2
- mingw-w64-x86_64-snappy
- mingw-w64-x86_64-libusb
- mingw-w64-x86_64-usbredir
- mingw-w64-x86_64-libtasn1
- mingw-w64-x86_64-nettle
- mingw-w64-x86_64-cyrus-sasl
- mingw-w64-x86_64-curl
- mingw-w64-x86_64-gnutls
- mingw-w64-x86_64-zstd"
+ mingw-w64-x86_64-python-sphinx"
+
script:
- C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure
--
2.28.0.windows.1
prev parent reply other threads:[~2020-10-07 3:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 3:11 [PATCH v2 0/2] Improve cirrus msys2 Yonggang Luo
2020-10-07 3:11 ` [PATCH v2 1/2] docker: Add win32/msys2/mingw64 docker Yonggang Luo
2020-10-07 3:11 ` Yonggang Luo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201007031148.232-3-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=f4bug@amsat.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.