Hi On Wed, Jan 4, 2023 at 4:36 PM Thomas Huth <th...@redhat.com> wrote: > > 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.
It seems msys2 recently enabled egl support, but qemu egl code has not been tested on win32 yet. I'll take a look. I am adding egl support in fedora mingw as well: https://src.fedoraproject.org/rpms/mingw-libepoxy/pull-request/3 > > Signed-off-by: Thomas Huth <th...@redhat.com> > --- > Now that the timeout and OpenGL problems are gone, the 64-bit is > working fine for me again. However, I'm still seeing random issues > with the 32-bit job ... not sure whether it's a problem on the > QEMU side or whether the builders are currently instable, since > the issues do not reproduce reliably... > > .gitlab-ci.d/windows.yml | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml > index 9b5c4bcd8a..22f794e537 100644 > --- a/.gitlab-ci.d/windows.yml > +++ b/.gitlab-ci.d/windows.yml > @@ -10,7 +10,7 @@ > - ${CI_PROJECT_DIR}/msys64/var/cache > needs: [] > stage: build > - timeout: 70m > + timeout: 80m > before_script: > - If ( !(Test-Path -Path msys64\var\cache ) ) { > mkdir msys64\var\cache > @@ -71,7 +71,7 @@ msys2-64bit: > # 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' > + --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. > @@ -113,6 +113,7 @@ msys2-32bit: > - $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 > + --disable-opengl' > - ..\msys64\usr\bin\bash -lc 'make' > - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; > exit 1; } ;' > -- > 2.31.1 > > Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> -- Marc-André Lureau