From: Michał Kępień <michal@isc.org>
Date: Thu, 7 May 2026 15:45:35 +0000 (+0200)
Subject: Enable automatic backports for security fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88b94a2019397e9c85d49c59aac4e2a11db5f779;p=thirdparty%2Fbind9.git

Enable automatic backports for security fixes

Ensure the "backports" CI job is created when new changes are merged
into security-* branches.  This enables using backport automation for
security fixes.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6278193e6b4..797fe0402c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2520,8 +2520,7 @@ pairwise:
 backports:
   <<: *post_merge
   rules:
-    # -sub branches are handled manually
-    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_REF_NAME =~ /^bind-9.[0-9]+$/ || $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]+$/ || $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH)'
   script:
     # CI job token is not sufficient for push operations
     - git remote get-url origin | sed -e "s/gitlab-ci-token:$CI_JOB_TOKEN/oauth2:$BIND_TEAM_WRITE_TOKEN/" | xargs git remote set-url --push origin