diff options
| author | Daniel Stone <daniels@collabora.com> | 2020-12-02 13:50:38 +0000 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-03 02:03:18 +0000 |
| commit | 220a467b7fa5fb22d15d646f45bc56debe73c0ed (patch) | |
| tree | c4b7f977aecda60fb7db648c54d96a427697e1d8 | |
| parent | 567332274579d5c1fe588dcb8759e0781ef2da1c (diff) | |
CI: Collapse lima & panfrost stages into one
This is now called 'arm'; even though they're two separate drivers, it
does help cut down on some of the more egregious horizontal scrolling.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7873>
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci/test-source-dep.yml | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78ba118f553..49d75428de6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,10 +26,9 @@ stages: - meson-x86_64 - build-misc - software-renderer - - freedreno - - panfrost - - lima - amd + - arm + - freedreno - layered-backends - success diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 78c01f07162..fe8e52ef77f 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -131,7 +131,7 @@ - when: never .panfrost-rules: - stage: panfrost + stage: arm rules: - *ignore_scheduled_pipelines - changes: @@ -148,7 +148,7 @@ - when: never .lima-rules: - stage: lima + stage: arm rules: - *ignore_scheduled_pipelines - changes: |