frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ci: move merge-request check into separate stage" 

This reverts commit 04c2fe5459.

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

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1338>
This commit is contained in:
Michel Dänzer 2024-02-28 09:30:53 +01:00 committed by Michel Dänzer
parent 1b625044dc
commit f2f6eaaa87
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -34,7 +34,6 @@ stages:
- docker-image - docker-image
- build-and-test - build-and-test
- test - test
- postcheck
.ci-run-policy: .ci-run-policy:
# Retry jobs after runner system failures # Retry jobs after runner system failures
@ -132,7 +131,7 @@ check-commits:
check-merge-request: check-merge-request:
extends: extends:
- .fdo.ci-fairy - .fdo.ci-fairy
stage: postcheck stage: test
rules: rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
script: script: