From 145a5cd414aaf444110328af6d9fa8d5c057fa22 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 2 Apr 2024 08:36:34 +0100
Subject: [PATCH] ci: fix nightly build (v2)

Scheduled pipelines don't have `changes`, so the rule I added in
fa4dd110986083105604 won't match; re-do that but as its own rule,
without the additional `changes` condition.

Fixes: 7c0b19a6071dc8fa0cd8 ("ci: run python-test automatically only in merge pipelines")
Fixes: fa4dd110986083105604 ("ci: fix nightly build")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28561>
---
 .gitlab-ci/test/gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index c2cf3d651b7e9..53c79fb24c589 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -59,7 +59,9 @@ python-test:
   rules:
     - !reference [.disable-farm-mr-rules, rules]
     - !reference [.never-post-merge-rules, rules]
-    - if: '$GITLAB_USER_LOGIN == "marge-bot" || $CI_PIPELINE_SOURCE == "schedule"'
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: on_success
+    - if: $GITLAB_USER_LOGIN == "marge-bot"
       changes: &bin_ci_files
         - .gitlab-ci.yml
         - .gitlab-ci/**/*