diff --git a/test-and-deploy.yml b/test-and-deploy.yml index c93ed5d66cc54e3448bfa6cd9ad3fdba87d3a580..a4b28e9ea9f17e80ffd41e8e48f741954fa6bbed 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