mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2026-05-05 09:58:14 +02:00
gitlab-ci: Enable vulkan-renderer on debian lts jobs
With newer Vulkan-Headers built in the container, we may un-disable vulkan-renderer in the debian lts jobs. This also simplifies the CI script by removing a variant that existed only for that purpose. Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
This commit is contained in:
parent
7bc103e5a1
commit
1939c732e8
1 changed files with 4 additions and 16 deletions
|
|
@ -445,22 +445,10 @@ aarch64-debian-container_prep:
|
|||
-Dwerror=true
|
||||
-Dtest-skip-is-failure=true
|
||||
|
||||
# Full build, (without vulkan-renderer, gcov and perfetto)
|
||||
# Current debian lts is too old to build vulkan-renderer
|
||||
# test-skip-is-failure is also taken out as we do skip Vulkan tests
|
||||
.build-options-full-v3:
|
||||
stage: "Full build and test"
|
||||
variables:
|
||||
MESON_OPTIONS: >
|
||||
-Doptimization=0
|
||||
-Dwerror=true
|
||||
-Dtest-skip-is-failure=false
|
||||
-Drenderer-vulkan=false
|
||||
|
||||
x86_64-debian-lts-full-build:
|
||||
extends:
|
||||
- .test-env-debian-lts-x86_64
|
||||
- .build-options-full-v3
|
||||
- .build-options-full-v2
|
||||
|
||||
x86_64-debian-full-build:
|
||||
extends:
|
||||
|
|
@ -475,7 +463,7 @@ x86_64-debian-full-build:
|
|||
aarch64-debian-lts-full-build:
|
||||
extends:
|
||||
- .test-env-debian-lts-aarch64
|
||||
- .build-options-full-v3
|
||||
- .build-options-full-v2
|
||||
|
||||
aarch64-debian-full-build:
|
||||
extends:
|
||||
|
|
@ -486,7 +474,7 @@ x86_64-clang-debian-lts-full-build:
|
|||
extends:
|
||||
- .test-env-debian-lts-x86_64
|
||||
- .build-with-clang
|
||||
- .build-options-full-v3
|
||||
- .build-options-full-v2
|
||||
|
||||
x86_64-clang-debian-full-build:
|
||||
extends:
|
||||
|
|
@ -498,7 +486,7 @@ aarch64-clang-debian-lts-full-build:
|
|||
extends:
|
||||
- .test-env-debian-lts-aarch64
|
||||
- .build-with-clang
|
||||
- .build-options-full-v3
|
||||
- .build-options-full-v2
|
||||
|
||||
aarch64-clang-debian-full-build:
|
||||
extends:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue