gitlab-ci: Use all_paths in .test-manual rules
authorMichel Dänzer <mdaenzer@redhat.com>
Sat, 11 Apr 2020 13:32:02 +0000 (15:32 +0200)
committerMarge Bot <eric+marge@anholt.net>
Mon, 13 Apr 2020 10:29:48 +0000 (10:29 +0000)
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@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4522>

.gitlab-ci.yml

index 9834541afac9c482737b37b903c0f014768e8c41..c221a9ca34f968a6474ea4d570e955a52d86e6df 100644 (file)
@@ -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: