From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH v4 12/12] ci: Enable msys2 ci in cirrus
Date: Thu, 3 Sep 2020 16:31:47 +0800 [thread overview]
Message-ID: <20200903083147.707-13-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200903083147.707-1-luoyonggang@gmail.com>
Install msys2 in a proper way refer to https://github.com/cirruslabs/cirrus-ci-docs/issues/699
The https://wiki.qemu.org/Hosts/W32#Native_builds_with_MSYS2 need to be updated.
There is no need of --cross-prefix, open mingw64.exe instead of msys2.exe then we don't
need the --cross-prefix, besides using ENV
MSYS: winsymlinks:nativestrict
MSYSTEM: MINGW64
CHERE_INVOKING: 1
to opening mingw64 native shell.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
.cirrus.yml | 24 +++++++++++++++++++++
scripts/ci/windows/msys2_build.sh | 33 +++++++++++++++++++++++++++++
scripts/ci/windows/msys2_install.sh | 31 +++++++++++++++++++++++++++
3 files changed, 88 insertions(+)
create mode 100644 scripts/ci/windows/msys2_build.sh
create mode 100644 scripts/ci/windows/msys2_install.sh
diff --git a/.cirrus.yml b/.cirrus.yml
index f287d23c5b..0bfb465193 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -40,3 +40,27 @@ macos_xcode_task:
- ../configure --cc=clang || { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake check
+
+windows_msys2_task:
+ windows_container:
+ image: cirrusci/windowsservercore:cmake
+ os_version: 2019
+ cpu: 8
+ memory: 8G
+ env:
+ 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 -Sy --noconfirm"
+ - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --needed --noconfirm -S 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 "sh scripts/ci/windows/msys2_install.sh"
+ script:
+ - C:\tools\msys64\usr\bin\bash.exe -lc "sh scripts/ci/windows/msys2_build.sh"
diff --git a/scripts/ci/windows/msys2_build.sh b/scripts/ci/windows/msys2_build.sh
new file mode 100644
index 0000000000..3ba89a4206
--- /dev/null
+++ b/scripts/ci/windows/msys2_build.sh
@@ -0,0 +1,33 @@
+mkdir build
+cd build
+../configure \
+ --python=python3 \
+ --enable-gtk --enable-sdl \
+ --enable-capstone=git \
+ --enable-stack-protector \
+ --ninja=ninja \
+ --enable-gnutls \
+ --enable-nettle \
+ --enable-vnc \
+ --enable-vnc-sasl \
+ --enable-vnc-jpeg \
+ --enable-vnc-png \
+ --enable-membarrier \
+ --enable-slirp=git \
+ --disable-kvm \
+ --enable-hax \
+ --enable-whpx \
+ --disable-spice \
+ --enable-lzo \
+ --enable-snappy \
+ --enable-bzip2 \
+ --enable-vdi \
+ --enable-qcow1 \
+ --enable-tools \
+ --enable-libusb \
+ --enable-usb-redir \
+ --enable-libnfs \
+ --enable-libssh \
+ --disable-pie
+make -j$NUMBER_OF_PROCESSORS
+# make check
diff --git a/scripts/ci/windows/msys2_install.sh b/scripts/ci/windows/msys2_install.sh
new file mode 100644
index 0000000000..ff35b73ef2
--- /dev/null
+++ b/scripts/ci/windows/msys2_install.sh
@@ -0,0 +1,31 @@
+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-SDL2 \
+mingw-w64-x86_64-SDL2_image \
+mingw-w64-x86_64-gtk3 \
+mingw-w64-x86_64-ninja \
+mingw-w64-x86_64-make \
+mingw-w64-x86_64-lzo2 \
+mingw-w64-x86_64-libjpeg-turbo \
+mingw-w64-x86_64-pixman \
+mingw-w64-x86_64-libgcrypt \
+mingw-w64-x86_64-capstone \
+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-libnfs \
+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-glib2
+
--
2.28.0.windows.1
prev parent reply other threads:[~2020-09-03 8:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 8:31 [PATCH v4 00/12] Green the msys2 CI make Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 01/12] configure: fixes dtc not cloned when running msys2 CI Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 02/12] meson: Convert undefsym.sh to undefsym.py Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 03/12] tcg: Fixes dup_const link error Yonggang Luo
2020-09-03 17:20 ` Richard Henderson
2020-09-03 21:19 ` 罗勇刚(Yonggang Luo)
2020-09-03 23:29 ` Richard Henderson
2020-09-03 8:31 ` [PATCH v4 04/12] tests: handling signal on win32 properly Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 05/12] configure: Fix include and linkage issue on msys2 Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 06/12] block: Fixes nfs on msys2/mingw Yonggang Luo
2020-09-03 14:40 ` Thomas Huth
2020-09-03 8:31 ` [PATCH v4 07/12] osdep: These function are only available on Non-Win32 system Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 08/12] ci: fixes msys2 build by upgrading capstone to 4.0.2 Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 09/12] stubs: qemu_notify_event have no need to stub Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 10/12] meson: Fixes qapi tests Yonggang Luo
2020-09-03 8:31 ` [PATCH v4 11/12] tests: Disable test-image-locking that not works under Win32 Yonggang Luo
2020-09-03 8:31 ` 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=20200903083147.707-13-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=pbonzini@redhat.com \
--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).