diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b30332c96..8b6415420 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,6 +77,9 @@ workflow: ) # Run for merge requests from any repo or branches - if: $CI_MERGE_REQUEST_ID + # run if NOCHANGELOG is added in the title + - if: $CI_MERGE_REQUEST_TITLE =~ /NOCHANGELOG/ + stages: - review @@ -166,7 +169,7 @@ require_changelog: # Don't run on merge request that mention NOCHANGELOG or renovate bot commits - if: > $CI_MERGE_REQUEST_TITLE =~ /NOCHANGELOG/ || - $CI_COMMIT_AUTHOR == "Renovate Bot " + $CI_COMMIT_AUTHOR == "RenovateBot " when: never - if: $CI_PIPELINE_SOURCE == "merge_request_event" diff --git a/.gitlab/renovate.json b/.gitlab/renovate.json index a2f7ac64a..acc160342 100644 --- a/.gitlab/renovate.json +++ b/.gitlab/renovate.json @@ -9,7 +9,7 @@ "group:monorepos", "group:recommended" ], - "baseBranches": ["stable", "develop"], + "baseBranches": ["develop"], "branchConcurrentLimit": 2, "prConcurrentLimit": 1, "rangeStrategy": "pin",