]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Mark merged security fixes as "Not released yet" 11984/head
authorPetr Špaček <pspacek@isc.org>
Tue, 5 May 2026 13:04:36 +0000 (15:04 +0200)
committerMichał Kępień <michal@isc.org>
Thu, 7 May 2026 15:58:33 +0000 (17:58 +0200)
Adjust the triggering rules for the "merged-metadata" CI job so that
merge requests merged into security-* branches are automatically
assigned to the "Not released yet" milestone, just like merge requests
targeting public branches.  This enables merge requests containing
security fixes to be correctly processed by release automation scripts.

.gitlab-ci.yml

index 797fe0402c03221eceeb9fb3236712a6c441d7eb..07ee9494fc5532694b14b696eaad9aa2791ddf30 100644 (file)
@@ -2530,7 +2530,7 @@ backports:
 merged-metadata:
   <<: *post_merge
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME =~ /^bind-9.[0-9]+(-sub)?$/ || $CI_COMMIT_REF_NAME =~ /^v9.[0-9]+.[0-9]+-release$/ || $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH)'
+    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME =~ /^security-(main|bind-9\.[0-9]+)$/ || $CI_COMMIT_REF_NAME =~ /^bind-9.[0-9]+(-sub)?$/ || $CI_COMMIT_REF_NAME =~ /^v9.[0-9]+.[0-9]+-release$/ || $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH)'
   script:
     - >
       "$CI_PROJECT_DIR"/bind9-qa/releng/after_merge.py "$CI_PROJECT_ID" "$MERGE_REQUEST_ID"