Mesa (master): gitlab-ci: Use all_paths in .test-manual rules
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Apr 13 10:53:22 UTC 2020
Module: Mesa
Branch: master
Commit: 6a8e5dde6684c477edddb044a38a6618bf38d014
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a8e5dde6684c477edddb044a38a6618bf38d014
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Sat Apr 11 15:32:02 2020 +0200
gitlab-ci: Use all_paths in .test-manual rules
Without this, the .test-manual jobs could end up as 'when: manual' when
the jobs they depend on were 'when: never', which was flagged as
invalid YAML, preventing the pipeline from being created.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4522>
---
.gitlab-ci.yml | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9834541afac..c221a9ca34f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -720,14 +720,11 @@ softpipe-gles31:
# to).
.test-manual:
rules:
- # Never test in the main project.
- - if: '$CI_PROJECT_PATH == "mesa/mesa"'
- when: never
- # Never test in merge requests.
- - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
- when: never
- # Otherwise, allow testing manually for personal branches.
- - when: manual
+ - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
+ changes:
+ *all_paths
+ when: manual
+ - when: never
arm64_a630_gles2:
extends:
More information about the mesa-commit
mailing list