8e31b744fd
When msys2 updated their libusb packages to libusb 1.0.27, they dropped support for building them for mingw32, leaving only mingw64 packages. This broke our CI job, as the 'pacman' package install now fails with: error: target not found: mingw-w64-i686-libusb error: target not found: mingw-w64-i686-usbredir (both these binary packages are from the libusb source package). Similarly, spice is now 64-bit only: error: target not found: mingw-w64-i686-spice Fix this by dropping these packages from the list we install for our msys2-32bit build. We do this with a simple mechanism for the msys2-64bit and msys2-32bit jobs to specify a list of extra packages to install on top of the common ones we install for both jobs. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2160 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru> Message-id: 20240215155009.2422335-1-peter.maydell@linaro.org
143 lines
5.4 KiB
YAML
143 lines
5.4 KiB
YAML
.shared_msys2_builder:
|
|
extends: .base_job_template
|
|
tags:
|
|
- shared-windows
|
|
- windows
|
|
- windows-1809
|
|
cache:
|
|
key: "$CI_JOB_NAME"
|
|
paths:
|
|
- msys64/var/cache
|
|
- ccache
|
|
when: always
|
|
needs: []
|
|
stage: build
|
|
timeout: 100m
|
|
variables:
|
|
# This feature doesn't (currently) work with PowerShell, it stops
|
|
# the echo'ing of commands being run and doesn't show any timing
|
|
FF_SCRIPT_SECTIONS: 0
|
|
artifacts:
|
|
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
|
expire_in: 7 days
|
|
paths:
|
|
- build/meson-logs/testlog.txt
|
|
reports:
|
|
junit: "build/meson-logs/testlog.junit.xml"
|
|
before_script:
|
|
- Write-Output "Acquiring msys2.exe installer at $(Get-Date -Format u)"
|
|
- If ( !(Test-Path -Path msys64\var\cache ) ) {
|
|
mkdir msys64\var\cache
|
|
}
|
|
- Invoke-WebRequest
|
|
"https://repo.msys2.org/distrib/msys2-x86_64-latest.sfx.exe.sig"
|
|
-outfile "msys2.exe.sig"
|
|
- if ( Test-Path -Path msys64\var\cache\msys2.exe.sig ) {
|
|
Write-Output "Cached installer sig" ;
|
|
if ( ((Get-FileHash msys2.exe.sig).Hash -ne (Get-FileHash msys64\var\cache\msys2.exe.sig).Hash) ) {
|
|
Write-Output "Mis-matched installer sig, new installer download required" ;
|
|
Remove-Item -Path msys64\var\cache\msys2.exe.sig ;
|
|
if ( Test-Path -Path msys64\var\cache\msys2.exe ) {
|
|
Remove-Item -Path msys64\var\cache\msys2.exe
|
|
}
|
|
} else {
|
|
Write-Output "Matched installer sig, cached installer still valid"
|
|
}
|
|
} else {
|
|
Write-Output "No cached installer sig, new installer download required" ;
|
|
if ( Test-Path -Path msys64\var\cache\msys2.exe ) {
|
|
Remove-Item -Path msys64\var\cache\msys2.exe
|
|
}
|
|
}
|
|
- if ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
|
|
Write-Output "Fetching latest installer" ;
|
|
Invoke-WebRequest
|
|
"https://repo.msys2.org/distrib/msys2-x86_64-latest.sfx.exe"
|
|
-outfile "msys64\var\cache\msys2.exe" ;
|
|
Copy-Item -Path msys2.exe.sig -Destination msys64\var\cache\msys2.exe.sig
|
|
} else {
|
|
Write-Output "Using cached installer"
|
|
}
|
|
- Write-Output "Invoking msys2.exe installer at $(Get-Date -Format u)"
|
|
- msys64\var\cache\msys2.exe -y
|
|
- ((Get-Content -path .\msys64\etc\\post-install\\07-pacman-key.post -Raw)
|
|
-replace '--refresh-keys', '--version') |
|
|
Set-Content -Path ${CI_PROJECT_DIR}\msys64\etc\\post-install\\07-pacman-key.post
|
|
- .\msys64\usr\bin\bash -lc "sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf"
|
|
- .\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu' # Core update
|
|
- .\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu' # Normal update
|
|
- taskkill /F /FI "MODULES eq msys-2.0.dll"
|
|
script:
|
|
- Write-Output "Installing mingw packages at $(Get-Date -Format u)"
|
|
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
|
|
bison diffutils flex
|
|
git grep make sed
|
|
$MINGW_TARGET-binutils
|
|
$MINGW_TARGET-capstone
|
|
$MINGW_TARGET-ccache
|
|
$MINGW_TARGET-curl
|
|
$MINGW_TARGET-cyrus-sasl
|
|
$MINGW_TARGET-dtc
|
|
$MINGW_TARGET-gcc
|
|
$MINGW_TARGET-glib2
|
|
$MINGW_TARGET-gnutls
|
|
$MINGW_TARGET-gtk3
|
|
$MINGW_TARGET-libgcrypt
|
|
$MINGW_TARGET-libjpeg-turbo
|
|
$MINGW_TARGET-libnfs
|
|
$MINGW_TARGET-libpng
|
|
$MINGW_TARGET-libssh
|
|
$MINGW_TARGET-libtasn1
|
|
$MINGW_TARGET-lzo2
|
|
$MINGW_TARGET-nettle
|
|
$MINGW_TARGET-ninja
|
|
$MINGW_TARGET-pixman
|
|
$MINGW_TARGET-pkgconf
|
|
$MINGW_TARGET-python
|
|
$MINGW_TARGET-SDL2
|
|
$MINGW_TARGET-SDL2_image
|
|
$MINGW_TARGET-snappy
|
|
$MINGW_TARGET-zstd
|
|
$EXTRA_PACKAGES "
|
|
- Write-Output "Running build at $(Get-Date -Format u)"
|
|
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
|
|
- $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
|
|
- $env:CCACHE_BASEDIR = "$env:CI_PROJECT_DIR"
|
|
- $env:CCACHE_DIR = "$env:CCACHE_BASEDIR/ccache"
|
|
- $env:CCACHE_MAXSIZE = "500M"
|
|
- $env:CCACHE_DEPEND = 1 # cache misses are too expensive with preprocessor mode
|
|
- $env:CC = "ccache gcc"
|
|
- mkdir build
|
|
- cd build
|
|
- ..\msys64\usr\bin\bash -lc "ccache --zero-stats"
|
|
- ..\msys64\usr\bin\bash -lc "../configure --enable-fdt=system $CONFIGURE_ARGS"
|
|
- ..\msys64\usr\bin\bash -lc "make"
|
|
- ..\msys64\usr\bin\bash -lc "make check MTESTARGS='$TEST_ARGS' || { cat meson-logs/testlog.txt; exit 1; } ;"
|
|
- ..\msys64\usr\bin\bash -lc "ccache --show-stats"
|
|
- Write-Output "Finished build at $(Get-Date -Format u)"
|
|
|
|
msys2-64bit:
|
|
extends: .shared_msys2_builder
|
|
variables:
|
|
MINGW_TARGET: mingw-w64-x86_64
|
|
MSYSTEM: MINGW64
|
|
# msys2 only ship these packages for 64-bit, not 32-bit
|
|
EXTRA_PACKAGES: $MINGW_TARGET-libusb $MINGW_TARGET-usbredir $MINGW_TARGET-spice
|
|
# 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
|
|
CONFIGURE_ARGS: --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0
|
|
# qTests don't run successfully with "--without-default-devices",
|
|
# so let's exclude the qtests from CI for now.
|
|
TEST_ARGS: --no-suite qtest
|
|
|
|
msys2-32bit:
|
|
extends: .shared_msys2_builder
|
|
variables:
|
|
MINGW_TARGET: mingw-w64-i686
|
|
MSYSTEM: MINGW32
|
|
EXTRA_PACKAGES:
|
|
CONFIGURE_ARGS: --target-list=ppc64-softmmu -Ddebug=false -Doptimization=0
|
|
TEST_ARGS: --no-suite qtest
|