xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f2f6eaaa87fcc7a2fa363a2106f6ff149c3b5aa7
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Wed Feb 28 09:30:53 2024 +0100

    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>

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:
commit 1b625044dc0a54e05802ea7ffb2d1987cda6d54f
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Wed Feb 28 09:30:00 2024 +0100

    ci: Create check-merge-request job only in MR pipelines
    
    It can't work as intended in other pipelines.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1338>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95be4aa58..0ac400f7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,6 +133,8 @@ check-merge-request:
   extends:
     - .fdo.ci-fairy
   stage: postcheck
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   script:
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
   artifacts: