From f2f6eaaa87fcc7a2fa363a2106f6ff149c3b5aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Wed, 28 Feb 2024 09:30:53 +0100
Subject: [PATCH] Revert "ci: move merge-request check into separate stage"

This reverts commit 04c2fe54594f9128aa3796b0a07555832bd4bb48.

The check-merge-request job no longer exists in non-MR pipelines.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1338>
---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ac400f7c..30f1e208a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,6 @@ stages:
     - docker-image
     - build-and-test
     - test
-    - postcheck
 
 .ci-run-policy:
   # Retry jobs after runner system failures
@@ -132,7 +131,7 @@ check-commits:
 check-merge-request:
   extends:
     - .fdo.ci-fairy
-  stage: postcheck
+  stage: test
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   script: