From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>
Subject: [PULL 7/8] cirrus-ci: Remove MSYS2 jobs duplicated with gitlab-ci
Date: Fri, 24 Mar 2023 16:36:09 +0100 [thread overview]
Message-ID: <20230324153610.224673-8-thuth@redhat.com> (raw)
In-Reply-To: <20230324153610.224673-1-thuth@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
- Various developers are reluctant to git Cirrus-CI the permissions
requested to access their GitHub account.
- When we use the cirrus-run script to trigger Cirrus-CI job from
GitLab-CI, the GitLab-CI job is restricted to a 1h timeout
(often not enough).
- Although Cirrus-CI VMs are more powerful than GitLab-CI ones,
its free plan is limited in 2 concurrent jobs.
- The GitLab-CI MSYS2 jobs are a 1:1 mapping with the Cirrus-CI ones
(modulo the environment caching).
Reduce the maintenance burden by removing the Cirrus-CI config file,
keeping the GitLab-CI jobs.
Update Yonggang Luo's maintenance file list to the new file, which
use the same environment shell.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230322135721.61138-3-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 3 +-
.cirrus.yml | 111 ----------------------------------------------------
2 files changed, 1 insertion(+), 113 deletions(-)
delete mode 100644 .cirrus.yml
diff --git a/MAINTAINERS b/MAINTAINERS
index 9b56ccdd92..34b50b267c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3818,8 +3818,7 @@ W: https://cirrus-ci.com/github/qemu/qemu
Windows Hosted Continuous Integration
M: Yonggang Luo <luoyonggang@gmail.com>
S: Maintained
-F: .cirrus.yml
-W: https://cirrus-ci.com/github/qemu/qemu
+F: .gitlab-ci.d/windows.yml
Guest Test Compilation Support
M: Alex Bennée <alex.bennee@linaro.org>
diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 5fb00da73d..0000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-env:
- CIRRUS_CLONE_DEPTH: 1
-
-windows_msys2_task:
- timeout_in: 90m
- windows_container:
- image: cirrusci/windowsservercore:2019
- os_version: 2019
- cpu: 8
- memory: 8G
- env:
- CIRRUS_SHELL: powershell
- MSYS: winsymlinks:native
- MSYSTEM: MINGW64
- MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe
- MSYS2_FINGERPRINT: 0
- MSYS2_PACKAGES: "
- diffutils git grep make pkg-config sed
- mingw-w64-x86_64-python
- mingw-w64-x86_64-python-sphinx
- 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-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-libnfs
- "
- CHERE_INVOKING: 1
- msys2_cache:
- folder: C:\tools\archive
- reupload_on_changes: false
- # These env variables are used to generate fingerprint to trigger the cache procedure
- # If wanna to force re-populate msys2, increase MSYS2_FINGERPRINT
- fingerprint_script:
- - |
- echo $env:CIRRUS_TASK_NAME
- echo $env:MSYS2_URL
- echo $env:MSYS2_FINGERPRINT
- echo $env:MSYS2_PACKAGES
- populate_script:
- - |
- md -Force C:\tools\archive\pkg
- $start_time = Get-Date
- bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND $env:MSYS2_URL C:\tools\archive\base.exe
- Write-Output "Download time taken: $((Get-Date).Subtract($start_time))"
- cd C:\tools
- C:\tools\archive\base.exe -y
- del -Force C:\tools\archive\base.exe
- Write-Output "Base install time taken: $((Get-Date).Subtract($start_time))"
- $start_time = Get-Date
-
- ((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\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 -Syuu --overwrite=*"
- Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))"
- $start_time = Get-Date
-
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed $env:MSYS2_PACKAGES"
- Write-Output "Package install time taken: $((Get-Date).Subtract($start_time))"
- $start_time = Get-Date
-
- del -Force -ErrorAction SilentlyContinue C:\tools\msys64\etc\mtab
- del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\fd
- del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stderr
- del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdin
- del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdout
- del -Force -Recurse -ErrorAction SilentlyContinue C:\tools\msys64\var\cache\pacman\pkg
- tar cf C:\tools\archive\msys64.tar -C C:\tools\ msys64
-
- Write-Output "Package archive time taken: $((Get-Date).Subtract($start_time))"
- del -Force -Recurse -ErrorAction SilentlyContinue c:\tools\msys64
- install_script:
- - |
- $start_time = Get-Date
- cd C:\tools
- ls C:\tools\archive\msys64.tar
- tar xf C:\tools\archive\msys64.tar
- Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))"
- script:
- - mkdir build
- - cd build
- - C:\tools\msys64\usr\bin\bash.exe -lc "../configure --python=python3
- --target-list-exclude=i386-softmmu,ppc64-softmmu,aarch64-softmmu,mips64-softmmu,mipsel-softmmu,sh4-softmmu"
- - C:\tools\msys64\usr\bin\bash.exe -lc "make -j8"
- - exit $LastExitCode
- test_script:
- - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check"
- - exit $LastExitCode
--
2.31.1
next prev parent reply other threads:[~2023-03-24 15:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-24 15:36 [PULL 0/8] Misc patches for QEMU 8.0-rc2 Thomas Huth
2023-03-24 15:36 ` [PULL 1/8] hw/ide: replace TABs with space Thomas Huth
2023-03-24 15:36 ` [PULL 2/8] hw/block: " Thomas Huth
2023-03-24 15:36 ` [PULL 3/8] target/s390x: Fix float_comp_to_cc() prototype Thomas Huth
2023-03-24 15:36 ` [PULL 4/8] target/ppc: Fix helper_pminsn() prototype Thomas Huth
2023-03-24 15:36 ` [PULL 5/8] ui/spice: fix compilation on win32 Thomas Huth
2023-03-24 15:36 ` [PULL 6/8] gitlab-ci: Cover SPICE in the MSYS2 job Thomas Huth
2023-03-24 15:36 ` Thomas Huth [this message]
2023-03-24 15:36 ` [PULL 8/8] Revert "docs/about/deprecated: Deprecate 32-bit arm hosts for system emulation" Thomas Huth
2023-03-25 16:29 ` [PULL 0/8] Misc patches for QEMU 8.0-rc2 Peter Maydell
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=20230324153610.224673-8-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).