From 2943fdacc24d586cb83d99e5612a0ce1c65ac855 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Wed, 10 Apr 2024 17:26:35 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#75 Also ignore audit tasks in main branch
when being merged from develop
---
test-and-deploy.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index c93ed5d..a4b28e9 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -789,6 +789,8 @@ Debug:
rules:
- if: $CI_COMMIT_MESSAGE =~ /SKIP_check4security/
when: never
+ - if: $CI_COMMIT_MESSAGE =~ /^Merge branch 'develop' into 'main'/
+ when: never
- if: $IGNORE_COMPOSER_AUDIT == "0"
when: always
- when: never
@@ -821,6 +823,8 @@ Debug:
rules:
- if: $CI_COMMIT_MESSAGE =~ /SKIP_check4outdated/
when: never
+ - if: $CI_COMMIT_MESSAGE =~ /^Merge branch 'develop' into 'main'/
+ when: never
- if: $IGNORE_COMPOSER_EXTENDED_AUDIT == "0"
when: always
- when: never
--
GitLab