fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ci: Drop duplicated include and add missing stages

Browse source 
The .collabora-freedreno-rules are overriten by
.collabora-freedreno-turnip-rules which already includes these rules.

Signed-off-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28323>
This commit is contained in:
David Heidelberg 2024-05-13 16:30:57 -07:00 • committed by Marge Bot
parent 926865580e
commit 0e5a567523
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/freedreno/ci/gitlab-ci-inc.yml
View file

@ -126,18 +126,21 @@
# For piglit and skqp test jobs that run both GL and VK tests.
.google-freedreno-turnip-rules:
stage: freedreno
rules:
- !reference [.test, rules]
- !reference [.google-freedreno-rules, rules]
- !reference [.google-turnip-rules, rules]
.google-freedreno-turnip-manual-rules:
stage: freedreno
rules:
- !reference [.test, rules]
- !reference [.google-freedreno-manual-rules, rules]
- !reference [.google-turnip-manual-rules, rules]
.collabora-freedreno-turnip-rules:
stage: freedreno
rules:
- !reference [.test, rules]
- !reference [.collabora-freedreno-rules, rules]

1
src/freedreno/ci/gitlab-ci.yml
View file

@ -134,7 +134,6 @@ a618_piglit:
extends:
- .lava-test-deqp:arm64
- .lava-sc7180-trogdor-lazor-limozeen:arm64
- .collabora-freedreno-rules
# Note that piglit has GL+VK integration testing.
- .collabora-freedreno-turnip-rules
variables: