From: Andoni Duarte Pintado <andoni@isc.org>
Date: Tue, 23 Sep 2025 09:20:46 +0000 (+0200)
Subject: Merge tag back to its base branch in tag pipeline
X-Git-Tag: v9.18.41~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1813a5045bd157255f2e1726260f2a65a66771a6;p=thirdparty%2Fbind9.git

Merge tag back to its base branch in tag pipeline

Merging a tag to its base branch will now be a manual job in its tag
pipeline.

(cherry picked from commit 22bc6a70639be16e5d2ee8b1adcce87b157d220d)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efc2a629464..8fe9d7f5791 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1632,6 +1632,26 @@ sign:
   when: manual
   allow_failure: false
 
+# Job merging the tag back into its base branch
+
+merge-tag:
+  <<: *base_image
+  stage: release
+  when: manual
+  variables:
+    GIT_DEPTH: 100
+  before_script:
+    - git clone --depth 1 https://gitlab.isc.org/isc-projects/bind9-qa.git
+  script:
+    - bind9-qa/releng/merge_tag.py --tag "$CI_COMMIT_TAG"
+  needs: []
+  rules:
+    - if: '$CI_COMMIT_TAG != null && $CI_COMMIT_TAG !~ /-S/'
+  artifacts:
+    paths:
+      - bind9/
+    when: on_failure
+
 .customer-git: &customer_git
   <<: *base_image
   stage: release