Message ID | 20230109112110.128967-3-marcandre.lureau@redhat.com |
---|---|
State | New |
Headers | show |
Series | [1/2] build-sys: fix crlf-ending C code | expand |
On 09/01/2023 12.21, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > The previous patch should fix shader compilation. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > .gitlab-ci.d/windows.yml | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml > index 22f794e537..5e59a7cc96 100644 > --- a/.gitlab-ci.d/windows.yml > +++ b/.gitlab-ci.d/windows.yml > @@ -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 --disable-opengl' > + --without-default-devices' > - ..\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,7 +113,6 @@ msys2-32bit: > - $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 '../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; } ;' Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 22f794e537..5e59a7cc96 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -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 --disable-opengl' + --without-default-devices' - ..\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,7 +113,6 @@ msys2-32bit: - $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 '../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; } ;'