From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Ed Maste" <emaste@freebsd.org>,
"Yonggang Luo" <luoyonggang@gmail.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Li-Wen Hsu" <lwhsu@freebsd.org>
Subject: [PATCH v1 04/22] cirrus: Fixing and speedup the msys2/mingw CI
Date: Wed, 7 Oct 2020 17:00:20 +0100 [thread overview]
Message-ID: <20201007160038.26953-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20201007160038.26953-1-alex.bennee@linaro.org>
From: Yonggang Luo <luoyonggang@gmail.com>
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 <luoyonggang@gmail.com>
Message-Id: <20201007145300.1197-2-luoyonggang@gmail.com>
[AJB: renamed printenv_script to setup_script]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.cirrus.yml | 112 +++++++++++++++++++++++++++++++---------------------
1 file changed, 67 insertions(+), 45 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index d58782ce67..eb768fa260 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'
+ setup_script:
+ - choco install -y --no-progress 7zip
+ - Write-Output $env:PATH
+ msys2_cache:
+ folder: C:\tools\archive
+ reupload_on_changes: false
+ fingerprint_script: cat .cirrus.yml
+ populate_script:
+ - |
+ md C:\tools
+ md C:\tools\archive
+ $start_time = Get-Date
+ cd C:\tools
+ 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
+ ((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"
+ tasklist
+ C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true"
+ C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --overwrite=*"
+ C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
+ diffutils git grep make pkg-config sed \
+ mingw-w64-x86_64-python \
+ mingw-w64-x86_64-python-setuptools \
+ mingw-w64-x86_64-toolchain \
+ 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-jemalloc \
+ 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 \
+ "
+ C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg/*"
+ cd C:\tools\msys64
+ echo "Start archive"
+ cmd /C "7z a -ttar . -so | 7z a -txz -simsys2-x86_64.tar C:\tools\archive\msys2-x86_64.tar.xz"
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"
- - 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"
+ - |
+ cd C:\tools
+ cmd /C "7z x C:\tools\archive\msys2-x86_64.tar.xz -so | 7z x -aoa -simsys2-x86_64.tar -ttar -omsys64"
+ C:\tools\msys64\usr\bin\bash.exe -lc "export"
+
script:
- C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure
--python=python3 --ninja=ninja
--target-list-exclude=i386-softmmu,arm-softmmu,ppc-softmmu,mips-softmmu"
- - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j$NUMBER_OF_PROCESSORS"
+ - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8"
test_script:
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check"
--
2.20.1
next prev parent reply other threads:[~2020-10-07 16:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 16:00 [PATCH v1 00/22] testing and plugin fixes with gitdm updates (pre PR) Alex Bennée
2020-10-07 16:00 ` [PATCH v1 01/22] configure: fix performance regression due to PIC objects Alex Bennée
2020-10-07 16:00 ` [PATCH v1 02/22] hw/misc/mips_cpc: Start vCPU when powered on Alex Bennée
2020-10-07 16:00 ` [PATCH v1 03/22] hw/ide: restore replay support of IDE Alex Bennée
2020-10-07 16:35 ` John Snow
2020-10-07 17:53 ` Philippe Mathieu-Daudé
2020-10-08 12:36 ` Richard Henderson
2020-10-07 16:00 ` Alex Bennée [this message]
2020-10-07 16:00 ` [PATCH v1 05/22] cirrus: msys2/mingw speed is up, add excluded target back Alex Bennée
2020-10-07 16:00 ` [PATCH v1 06/22] tests/docker: Add genisoimage to the docker file Alex Bennée
2020-10-07 16:00 ` [PATCH v1 07/22] contrib/gitdm: Add more academic domains Alex Bennée
2020-10-07 16:00 ` [PATCH v1 08/22] contrib/gitdm: Add more individual contributors Alex Bennée
2020-10-07 16:00 ` [PATCH v1 09/22] contrib/gitdm: Add Baidu to the domain map Alex Bennée
2020-10-07 16:00 ` [PATCH v1 10/22] contrib/gitdm: Add ByteDance " Alex Bennée
2020-10-07 16:00 ` [PATCH v1 11/22] contrib/gitdm: Add Google " Alex Bennée
2020-10-07 16:00 ` [PATCH v1 12/22] contrib/gitdm: Add Nuvia " Alex Bennée
2020-10-07 16:00 ` [PATCH v1 13/22] contrib/gitdm: Add Qualcomm " Alex Bennée
2020-10-07 16:00 ` [PATCH v1 14/22] contrib/gitdm: Add Nir Soffer to Red Hat domain Alex Bennée
2020-10-07 16:00 ` [PATCH v1 15/22] contrib/gitdm: Add SUSE to the domain map Alex Bennée
2020-10-07 16:00 ` [PATCH v1 16/22] contrib/gitdm: Add Yadro " Alex Bennée
2020-10-07 16:00 ` [PATCH v1 17/22] contrib/gitdm: Add Yandex " Alex Bennée
2020-10-07 16:00 ` [PATCH v1 18/22] .mailmap: Fix more contributor entries Alex Bennée
2020-10-07 16:00 ` [PATCH v1 19/22] plugins: Fixes a issue when dlsym failed, the handle not closed Alex Bennée
2020-10-07 16:00 ` [PATCH v1 20/22] plugin: Fixes compiling errors on msys2/mingw Alex Bennée
2020-10-07 16:00 ` [PATCH v1 21/22] cirrus: use V=1 when running tests on FreeBSD and macOS Alex Bennée
2020-10-08 1:31 ` Ed Maste
2020-10-07 16:00 ` [PATCH v1 22/22] tests/acceptance: disable machine_rx_gdbsim on GitLab Alex Bennée
2020-10-07 17:07 ` Willian Rampazzo
2020-10-08 14:55 ` Cleber Rosa
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=20201007160038.26953-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=emaste@freebsd.org \
--cc=luoyonggang@gmail.com \
--cc=lwhsu@freebsd.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).