cb9c6a8e5a
The windows jobs (especially the 32-bit job) recently started to hit the timeout limit. Bump it a little bit to ease the situation (80 minutes is quite long already - OTOH, these jobs do not have to wait for a job from the container stage to finish, so this should still be OK). Additionally, some update on the container side recently enabled OpenGL in these jobs - but the corresponding code fails to compile. Thus disable OpenGL here for the time being until someone figured out the proper fix in the shader code for this. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20230104123559.277586-1-thuth@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
120 lines
4.3 KiB
YAML
120 lines
4.3 KiB
YAML
.shared_msys2_builder:
|
|
extends: .base_job_template
|
|
tags:
|
|
- shared-windows
|
|
- windows
|
|
- windows-1809
|
|
cache:
|
|
key: "${CI_JOB_NAME}-cache"
|
|
paths:
|
|
- ${CI_PROJECT_DIR}/msys64/var/cache
|
|
needs: []
|
|
stage: build
|
|
timeout: 80m
|
|
before_script:
|
|
- If ( !(Test-Path -Path msys64\var\cache ) ) {
|
|
mkdir msys64\var\cache
|
|
}
|
|
- If ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
|
|
Invoke-WebRequest
|
|
"https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe"
|
|
-outfile "msys64\var\cache\msys2.exe"
|
|
}
|
|
- 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"
|
|
|
|
msys2-64bit:
|
|
extends: .shared_msys2_builder
|
|
script:
|
|
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
|
|
bison diffutils flex
|
|
git grep make sed
|
|
mingw-w64-x86_64-capstone
|
|
mingw-w64-x86_64-curl
|
|
mingw-w64-x86_64-cyrus-sasl
|
|
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
|
|
mingw-w64-x86_64-pkgconf
|
|
mingw-w64-x86_64-python
|
|
mingw-w64-x86_64-SDL2
|
|
mingw-w64-x86_64-SDL2_image
|
|
mingw-w64-x86_64-snappy
|
|
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:MSYS = 'winsymlinks:native' # Enable native Windows symlink
|
|
- 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 --disable-opengl'
|
|
- ..\msys64\usr\bin\bash -lc 'make'
|
|
# qTests don't run successfully with "--without-default-devices",
|
|
# so let's exclude the qtests from CI for now.
|
|
- ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=\"--no-suite qtest\" || { cat meson-logs/testlog.txt; exit 1; } ;'
|
|
|
|
msys2-32bit:
|
|
extends: .shared_msys2_builder
|
|
script:
|
|
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
|
|
bison diffutils flex
|
|
git grep make sed
|
|
mingw-w64-i686-capstone
|
|
mingw-w64-i686-curl
|
|
mingw-w64-i686-cyrus-sasl
|
|
mingw-w64-i686-gcc
|
|
mingw-w64-i686-glib2
|
|
mingw-w64-i686-gnutls
|
|
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-zstd "
|
|
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
|
|
- $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
|
|
--disable-opengl'
|
|
- ..\msys64\usr\bin\bash -lc 'make'
|
|
- ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;'
|