[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/23] .gitlab-ci.d/windows.yml: Unify the prerequisite packages
From: |
Thomas Huth |
Subject: |
[PULL 16/23] .gitlab-ci.d/windows.yml: Unify the prerequisite packages |
Date: |
Wed, 14 Dec 2022 11:09:04 +0100 |
From: Bin Meng <bin.meng@windriver.com>
At present the prerequisite packages for 64-bit and 32-bit builds
are slightly different. Let's use the same packages for both for
easier maintenance in the future.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Message-Id: <20221125114100.3184790-1-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/windows.yml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index a3e7a37022..99d78c2213 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -41,11 +41,15 @@ msys2-64bit:
mingw-w64-x86_64-gcc
mingw-w64-x86_64-glib2
mingw-w64-x86_64-gnutls
+ mingw-w64-x86_64-gtk3
+ mingw-w64-x86_64-libgcrypt
+ mingw-w64-x86_64-libjpeg-turbo
mingw-w64-x86_64-libnfs
mingw-w64-x86_64-libpng
mingw-w64-x86_64-libssh
mingw-w64-x86_64-libtasn1
mingw-w64-x86_64-libusb
+ mingw-w64-x86_64-lzo2
mingw-w64-x86_64-nettle
mingw-w64-x86_64-ninja
mingw-w64-x86_64-pixman
@@ -79,16 +83,22 @@ msys2-32bit:
mingw-w64-i686-gtk3
mingw-w64-i686-libgcrypt
mingw-w64-i686-libjpeg-turbo
+ mingw-w64-i686-libnfs
+ mingw-w64-i686-libpng
mingw-w64-i686-libssh
mingw-w64-i686-libtasn1
mingw-w64-i686-libusb
mingw-w64-i686-lzo2
+ mingw-w64-i686-nettle
mingw-w64-i686-ninja
mingw-w64-i686-pixman
mingw-w64-i686-pkgconf
mingw-w64-i686-python
+ mingw-w64-i686-SDL2
+ mingw-w64-i686-SDL2_image
mingw-w64-i686-snappy
- mingw-w64-i686-usbredir "
+ mingw-w64-i686-usbredir
+ mingw-w64-i686-zstd "
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
- $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment
- $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
--
2.31.1
- [PULL 12/23] hw: Include the VMWare devices only in the x86 targets, (continued)
- [PULL 12/23] hw: Include the VMWare devices only in the x86 targets, Thomas Huth, 2022/12/14
- [PULL 02/23] s390x/pci: shrink DMA aperture to be bound by vfio DMA limit, Thomas Huth, 2022/12/14
- [PULL 10/23] util/oslib-win32: Remove obsolete reference to g_poll code, Thomas Huth, 2022/12/14
- [PULL 03/23] s390x/pci: reset ISM passthrough devices on shutdown and system reset, Thomas Huth, 2022/12/14
- [PULL 08/23] scripts/make-release: Only clone single branches to speed up the script, Thomas Huth, 2022/12/14
- [PULL 15/23] tests/qtest/libqos/e1000e: Correctly group register accesses, Thomas Huth, 2022/12/14
- [PULL 01/23] s390x/pci: coalesce unmap operations, Thomas Huth, 2022/12/14
- [PULL 05/23] target/s390x: The MVCP and MVCS instructions are not privileged, Thomas Huth, 2022/12/14
- [PULL 17/23] .gitlab-ci.d/windows.yml: Keep 64-bit and 32-bit build scripts consistent, Thomas Huth, 2022/12/14
- [PULL 20/23] FreeBSD: Upgrade to 12.4 release, Thomas Huth, 2022/12/14
- [PULL 16/23] .gitlab-ci.d/windows.yml: Unify the prerequisite packages,
Thomas Huth <=
- [PULL 18/23] .gitlab-ci.d/windows.yml: Exclude qTests from 64-bit CI job for now, Thomas Huth, 2022/12/14
- [PULL 21/23] gitlab-ci: Check building ppc64 without TCG, Thomas Huth, 2022/12/14
- [PULL 23/23] tests/qtest/vhost-user-blk-test: don't abort all qtests on missing envar, Thomas Huth, 2022/12/14
- [PULL 22/23] .gitlab/issue_templates: Move suggestions into comments, Thomas Huth, 2022/12/14
- [PULL 06/23] monitor/misc: Remove superfluous include statements, Thomas Huth, 2022/12/14
- [PULL 14/23] tests/qtest/e1000e-test: De-duplicate constants, Thomas Huth, 2022/12/14
- [PULL 13/23] tests/qtest/libqos/e1000e: Remove "other" interrupts, Thomas Huth, 2022/12/14
- [PULL 09/23] util/qemu-config: Fix "query-command-line-options" to provide the right values, Thomas Huth, 2022/12/14
- [PULL 11/23] MAINTAINERS: Add documentation files to the corresponding sections, Thomas Huth, 2022/12/14
- [PULL 07/23] scripts/make-release: Add a simple help text for the script, Thomas Huth, 2022/12/14