From 59f80b71a2628cc89d745eeb2f34c178ffae736f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 31 Dec 2022 13:28:13 +0100
Subject: [PATCH] Run check jobs on merge request against default branch
 (grafted from 31011a740cb39bc374892e3d27a19c8181b4cb2e)

--HG--
branch : 6.0
---
 .gitlab-scripts/gitlab-ci.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-scripts/gitlab-ci.yml b/.gitlab-scripts/gitlab-ci.yml
index bfb5327c33..82f4a0884f 100644
--- a/.gitlab-scripts/gitlab-ci.yml
+++ b/.gitlab-scripts/gitlab-ci.yml
@@ -32,9 +32,6 @@ documentation:
 
 .check:
   stage: check
-  rules:
-    - if: $CI_MERGE_REQUEST_ID != null
-      when: always
   image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/tryton/ci
 
 .check-doc:
@@ -63,8 +60,14 @@ check-doc-readthedocs:
     - changes:
         - ${PACKAGE}/**/*
 
-check-flake8:
+.check-code:
   extends: .check
+  rules:
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
+      when: always
+
+check-flake8:
+  extends: .check-code
   script:
     - hg diff --rev s0 | flake8 --diff