[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/23] .gitlab-ci.d/windows.yml: Keep 64-bit and 32-bit build scri
From: |
Thomas Huth |
Subject: |
[PULL 17/23] .gitlab-ci.d/windows.yml: Keep 64-bit and 32-bit build scripts consistent |
Date: |
Wed, 14 Dec 2022 11:09:05 +0100 |
From: Bin Meng <bin.meng@windriver.com>
At present the build scripts of 32-bit and 64-bit are inconsistent.
Let's keep them consistent for easier maintenance.
While we are here, add some comments to explain that for the 64-bit
job, "--without-default-devices" is a must have, at least for now.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20221125114100.3184790-2-bmeng.cn@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/windows.yml | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 99d78c2213..6741c90ff1 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -61,12 +61,19 @@ msys2-64bit:
mingw-w64-x86_64-usbredir
mingw-w64-x86_64-zstd "
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
- - $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment
+ - $env:MSYSTEM = 'MINGW64' # Start a 64-bit MinGW environment
- $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
- - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu
- --enable-capstone --without-default-devices'
- - .\msys64\usr\bin\bash -lc 'make'
- - .\msys64\usr\bin\bash -lc 'make check || { cat
build/meson-logs/testlog.txt; exit 1; } ;'
+ - mkdir output
+ - cd output
+ # Note: do not remove "--without-default-devices"!
+ # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using
--without-default-devices"
+ # changed to compile QEMU with the --without-default-devices switch
+ # for the msys2 64-bit job, due to the build could not complete within
+ # the project timeout.
+ - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu
+ --without-default-devices'
+ - ..\msys64\usr\bin\bash -lc 'make'
+ - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt;
exit 1; } ;'
msys2-32bit:
extends: .shared_msys2_builder
@@ -100,10 +107,10 @@ msys2-32bit:
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:MSYSTEM = 'MINGW32' # Start a 32-bit MinGW environment
- $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
- mkdir output
- cd output
- - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu"
+ - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu'
- ..\msys64\usr\bin\bash -lc 'make'
- ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt;
exit 1; } ;'
--
2.31.1
- [PULL 00/23] First batch of s390x, qtest, CI and misc patches for 8.0, Thomas Huth, 2022/12/14
- [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 <=
- [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, 2022/12/14
- [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