diff options
author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2023-04-03 14:17:07 +0200 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2023-04-04 23:49:53 +0000 |
commit | 67750f138bd105a4514dc1b70b1577ca34f1a4cf (patch) | |
tree | 3ad97c2d57c9944aee6f11d1585ad46b29b85514 /.gitlab-ci/test-source-dep.yml | |
parent | 61451af5a20331f49044bf1a9c695b0eb93de7fb (diff) | |
download | mesa-67750f138bd105a4514dc1b70b1577ca34f1a4cf.tar.gz |
ci: move virgl-rules after intel-rules
We're about to add a dependency on stuff from the intel-rules, and
moving virgl down here allows us to depend on them without having to
move the definition out of the intel-section.
Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Acked-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22263>
Diffstat (limited to '.gitlab-ci/test-source-dep.yml')
-rw-r--r-- | .gitlab-ci/test-source-dep.yml | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 60ee771a478..d418ebaf4ba 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -566,38 +566,6 @@ *radv_file_list when: manual -.virgl-rules: - stage: layered-backends - rules: - - !reference [.gl-rules, rules] - - changes: - *llvmpipe_file_list - when: on_success - - changes: &virgl_file_list - - src/gallium/drivers/virgl/**/* - - src/gallium/winsys/virgl/**/* - when: on_success - -.virgl-iris-rules-performance: - stage: layered-backends - rules: - - !reference [.collabora-farm-rules, rules] - - !reference [.performance-rules, rules] - - !reference [.gl-manual-rules, rules] - - changes: - *llvmpipe_file_list - when: manual - - changes: - *virgl_file_list - when: manual - allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. - variables: - LAVA_JOB_PRIORITY: 40 - MINIO_ARTIFACT_NAME: "mesa-amd64-release" - needs: - - kernel+rootfs_amd64 - - debian-release - .venus-rules: stage: layered-backends rules: @@ -775,6 +743,38 @@ - src/intel/**/* when: on_success +.virgl-rules: + stage: layered-backends + rules: + - !reference [.gl-rules, rules] + - changes: + *llvmpipe_file_list + when: on_success + - changes: &virgl_file_list + - src/gallium/drivers/virgl/**/* + - src/gallium/winsys/virgl/**/* + when: on_success + +.virgl-iris-rules-performance: + stage: layered-backends + rules: + - !reference [.collabora-farm-rules, rules] + - !reference [.performance-rules, rules] + - !reference [.gl-manual-rules, rules] + - changes: + *llvmpipe_file_list + when: manual + - changes: + *virgl_file_list + when: manual + allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. + variables: + LAVA_JOB_PRIORITY: 40 + MINIO_ARTIFACT_NAME: "mesa-amd64-release" + needs: + - kernel+rootfs_amd64 + - debian-release + .zink-common-rules: rules: - !reference [.gl-rules, rules] |