From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Yonggang Luo <luoyonggang@gmail.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Ed Maste <emaste@freebsd.org>,
qemu-block@nongnu.org, Stefan Weil <sw@weilnetz.de>,
Xie Changlong <xiechanglong.d@gmail.com>,
Peter Lieven <pl@kamp.de>,
qemu-devel@nongnu.org, Michael Roth <mdroth@linux.vnet.ibm.com>,
Richard Henderson <richard.henderson@linaro.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Wen Congyang <wencongyang2@huawei.com>,
Max Reitz <mreitz@redhat.com>, Li-Wen Hsu <lwhsu@freebsd.org>,
Markus Armbruster <armbru@redhat.com>
Subject: Re: [PATCH v2 06/21] ci: Enable msys2 ci in cirrus
Date: Wed, 9 Sep 2020 13:53:20 +0100 [thread overview]
Message-ID: <20200909125320.GX1011023@redhat.com> (raw)
In-Reply-To: <20200909094617.1582-7-luoyonggang@gmail.com>
On Wed, Sep 09, 2020 at 05:46:02PM +0800, Yonggang Luo wrote:
> 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 we using environment variable settings:
> MSYS: winsymlinks:nativestrict
> MSYSTEM: MINGW64
> CHERE_INVOKING: 1
> to opening mingw64 native shell.
> We now running tests with make -i check to skip tests errors.
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
> .cirrus.yml | 24 +++++++++++++++++++++
> scripts/ci/windows/msys2-build.sh | 28 ++++++++++++++++++++++++
> scripts/ci/windows/msys2-install.sh | 33 +++++++++++++++++++++++++++++
> 3 files changed, 85 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 3dd9fcff7f..49335e68c9 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -63,3 +63,27 @@ macos_xcode_task:
> --enable-werror --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..d9d046b5b0
> --- /dev/null
> +++ b/scripts/ci/windows/msys2-build.sh
> @@ -0,0 +1,28 @@
> +mkdir build
> +cd build
> +../configure \
> +--python=python3 \
> +--ninja=ninja \
> +--enable-stack-protector \
> +--enable-guest-agent \
> +--disable-pie \
> +--enable-gnutls --enable-nettle \
> +--enable-sdl --enable-sdl-image --enable-gtk --disable-vte --enable-curses --enable-iconv \
> +--enable-vnc --enable-vnc-sasl --enable-vnc-jpeg --enable-vnc-png \
> +--enable-slirp=git \
> +--disable-brlapi --enable-curl \
> +--enable-fdt \
> +--disable-kvm --enable-hax --enable-whpx \
> +--enable-libnfs --enable-libusb --enable-live-block-migration --enable-usb-redir \
> +--enable-lzo --enable-snappy --enable-bzip2 --enable-zstd \
> +--enable-membarrier --enable-coroutine-pool \
> +--enable-libssh --enable-libxml2 \
> +--enable-jemalloc --enable-avx2 \
> +--enable-replication \
> +--enable-tools \
> +--enable-bochs --enable-cloop --enable-dmg --enable-qcow1 --enable-vdi --enable-vvfat --enable-qed --enable-parallels \
> +--enable-sheepdog \
> +--enable-capstone=git
> +
> +make -j$NUMBER_OF_PROCESSORS
> +make -i -j$NUMBER_OF_PROCESSORS check
This still needs the changes discussed in v1 to remove all the
configure args and move the commands into the main cirrus.yml
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2020-09-09 12:54 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 9:45 [PATCH v2 00/21] W32, W64 msys2/mingw patches Yonggang Luo
2020-09-09 9:45 ` [PATCH v2 01/21] block: Fixes nfs compiling error on msys2/mingw Yonggang Luo
2020-09-09 12:24 ` Daniel P. Berrangé
2020-09-10 7:01 ` Peter Lieven
2020-09-10 7:14 ` 罗勇刚(Yonggang Luo)
2020-09-10 7:29 ` Peter Lieven
2020-09-10 9:02 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:45 ` [PATCH v2 02/21] ci: fixes msys2 build by upgrading capstone to 4.0.2 Yonggang Luo
2020-09-09 12:26 ` Daniel P. Berrangé
2020-09-09 15:27 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:45 ` [PATCH v2 03/21] configure: Fixes ncursesw detection under msys2/mingw and enable curses Yonggang Luo
2020-09-09 12:50 ` Daniel P. Berrangé
2020-09-09 12:55 ` 罗勇刚(Yonggang Luo)
2020-09-09 13:22 ` Daniel P. Berrangé
2020-10-02 17:49 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 04/21] curses: Fixes curses compiling errors Yonggang Luo
2020-09-09 12:51 ` Daniel P. Berrangé
2020-09-09 13:26 ` Peter Maydell
2020-09-09 15:58 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 05/21] tests: disable /char/stdio/* tests in test-char.c on win32 Yonggang Luo
2020-09-09 12:52 ` Daniel P. Berrangé
2020-09-09 18:10 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 06/21] ci: Enable msys2 ci in cirrus Yonggang Luo
2020-09-09 12:53 ` Daniel P. Berrangé [this message]
2020-09-09 9:46 ` [PATCH v2 07/21] tests: Trying fixes test-replication.c on msys2/mingw Yonggang Luo
2020-09-09 12:55 ` Daniel P. Berrangé
2020-09-09 12:59 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 08/21] tests: test-replication disable /replication/secondary/* " Yonggang Luo
2020-09-09 12:58 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 09/21] osdep: These function are only available on Non-Win32 system Yonggang Luo
2020-09-09 12:59 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 10/21] meson: Use -b to ignore CR vs. CR-LF issues on Windows Yonggang Luo
2020-09-09 12:59 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 11/21] meson: disable crypto tests are empty under win32 Yonggang Luo
2020-09-09 13:00 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 12/21] meson: remove empty else and duplicated gio deps Yonggang Luo
2020-09-09 13:00 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 13/21] vmstate: Fixes test-vmstate.c on msys2/mingw Yonggang Luo
2020-09-09 13:05 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 14/21] cirrus: Building freebsd in a single short Yonggang Luo
2020-09-09 17:32 ` Ed Maste
2020-09-09 18:16 ` Daniel P. Berrangé
2020-09-09 18:28 ` 罗勇刚(Yonggang Luo)
2020-09-09 9:46 ` [PATCH v2 15/21] tests: Convert g_free to g_autofree macro in test-logging.c Yonggang Luo
2020-09-09 13:08 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 16/21] rcu: add uninit destructor for rcu Yonggang Luo
2020-09-09 9:46 ` [PATCH v2 17/21] tests: Fixes test-io-channel-socket.c tests under msys2/mingw Yonggang Luo
2020-09-09 13:08 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 18/21] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c Yonggang Luo
2020-09-09 9:46 ` [PATCH v2 19/21] tests: Fixes test-io-channel-file by mask only owner file state mask bits Yonggang Luo
2020-09-09 13:10 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 20/21] tests: fix test-util-sockets.c Yonggang Luo
2020-09-09 13:11 ` Daniel P. Berrangé
2020-09-09 9:46 ` [PATCH v2 21/21] tests: Fixes test-qdev-global-props.c Yonggang Luo
2020-09-09 13:18 ` Daniel P. Berrangé
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=20200909125320.GX1011023@redhat.com \
--to=berrange@redhat.com \
--cc=armbru@redhat.com \
--cc=emaste@freebsd.org \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=lwhsu@freebsd.org \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mreitz@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sw@weilnetz.de \
--cc=wencongyang2@huawei.com \
--cc=xiechanglong.d@gmail.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 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).