[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/35] .gitlab-ci.d/windows: do not disable opengl
From: |
Alex Bennée |
Subject: |
[PATCH v2 06/35] .gitlab-ci.d/windows: do not disable opengl |
Date: |
Tue, 24 Jan 2023 18:00:58 +0000 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The previous patch should have fixed shader compilation.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230110132700.833690-3-marcandre.lureau@redhat.com>
[AJB: tweak commit message]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.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 a1d5790580..cf445b77f6 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,8 +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
- --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 MTESTARGS=\"--no-suite qtest\" ||
{ cat meson-logs/testlog.txt; exit 1; }'
--
2.34.1
- [PATCH v2 00/35] maintainer tree pre-PR (testing/docs/semihosting/plugins), Alex Bennée, 2023/01/24
- [PATCH v2 03/35] gitlab: just use plain --cc=clang for custom runner build, Alex Bennée, 2023/01/24
- [PATCH v2 06/35] .gitlab-ci.d/windows: do not disable opengl,
Alex Bennée <=
- [PATCH v2 01/35] scripts/ci: update gitlab-runner playbook to use latest runner, Alex Bennée, 2023/01/24
- [PATCH v2 05/35] build-sys: fix crlf-ending C code, Alex Bennée, 2023/01/24
- [PATCH v2 04/35] tests/unit: drop hacky race avoidance in test-io-channel-command, Alex Bennée, 2023/01/24
- [PATCH v2 08/35] docs: drop texinfo options, Alex Bennée, 2023/01/24
- [PATCH v2 02/35] gitlab: add FF_SCRIPT_SECTIONS for timings, Alex Bennée, 2023/01/24
- [PATCH v2 12/35] lcitool: drop texinfo from QEMU project/dependencies, Alex Bennée, 2023/01/24
- [PATCH v2 11/35] lcitool: drop perl from QEMU project/dependencies, Alex Bennée, 2023/01/24