vulkan/wsi: remove unused image_get_modifier

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd53f02cbe0a4aa5de90f34627a3017ca0003777..90bb3b33feffca59bd8f2323dcea430f2e98d003 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,8 +45,7 @@ stages:
         *paths
       when: on_success
     # Allow triggering jobs manually on branches of forked projects
-    - if: '$CI_PROJECT_PATH != "mesa/mesa"'
-      if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
+    - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
       when: manual
     # Otherwise, most jobs won't run
     - when: never
@@ -65,6 +64,8 @@ success:
   except:
     changes:
       *paths
+  variables:
+    GIT_STRATEGY: none
   script:
     - echo "Dummy job to make sure every merge request pipeline runs at least one job"