From d48c91c5821f8463ff5af489b0f33aa7fca57d63 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 26 Jun 2024 11:18:15 +0200
Subject: [PATCH] docs/ci: merge test-docs and test-docs-mr

No reason to have two different jobs, they both do exactly the same
thing with just different rules for existing.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29908>
---
 .gitlab-ci/container/gitlab-ci.yml |  1 -
 docs/gitlab-ci.yml                 | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 4d5e580cf84..24faa9a7dd4 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -349,7 +349,6 @@ alpine/x86_64_build:
   rules:
     - !reference [pages, rules]
     - !reference [test-docs, rules]
-    - !reference [test-docs-mr, rules]
     - !reference [linkcheck-docs, rules]
     - !reference [.container, rules]
 
diff --git a/docs/gitlab-ci.yml b/docs/gitlab-ci.yml
index 21c7a7db03e..d4019e5fba3 100644
--- a/docs/gitlab-ci.yml
+++ b/docs/gitlab-ci.yml
@@ -37,18 +37,14 @@ test-docs:
   stage: deploy
   rules:
     - !reference [.no_scheduled_pipelines-rules, rules]
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_NAMESPACE != "mesa"'
-      changes: *docs-or-ci
-      when: manual
-    # Other cases default to never
-
-test-docs-mr:
-  extends:
-    - test-docs
-  rules:
+    # pre-merge or merge pipeline
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes: *docs-or-ci
       when: on_success
+    # fork pipeline
+    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_NAMESPACE != "mesa"'
+      changes: *docs-or-ci
+      when: manual
     # Other cases default to never
 
 linkcheck-docs: