From d481f7dcafacd7d6a294ec7f130f43cbe065325b Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Sun, 24 May 2026 17:50:49 +0000
Subject: [PATCH 1/4] Fix duplicate rules: key in meson-format CI job

The meson-format job had two `rules:` blocks. YAML silently overwrites
the first with the second, so the job only ran on MRs with meson.build
changes. The intended rules (tags, schedules, other pipeline sources)
were silently discarded. Remove the duplicate to restore the original
intent.

Assisted-by: Claude:claude-opus-4-7
---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c7fc4a09e..83c363af6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -766,10 +766,6 @@ meson-format:
       - meson-format.patch
     expire_in: "1 week"
     when: on_failure
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes:
-        - "**/meson.build"
 
 doctest:
   <<: *quick_checks_job

From a8223090eab5882b8136fcb96ccc2b5bd65d09f1 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Sun, 24 May 2026 19:15:40 +0000
Subject: [PATCH 2/4] Add missing TSAN_SYMBOLIZER_PATH in system:gcc:tsan CI
 job

The system:gcc:tsan job had an empty variables: block, unlike its
three sibling TSAN jobs (unit:gcc:tsan, system:clang:tsan,
unit:clang:tsan) which all set TSAN_SYMBOLIZER_PATH.

Assisted-by: Claude:claude-opus-4-7
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83c363af6b..fa6d23a596 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1700,6 +1700,7 @@ gcc:tsan:
 
 system:gcc:tsan:
   variables:
+    TSAN_SYMBOLIZER_PATH: "${TSAN_SYMBOLIZER_PATH_FEDORA}"
   <<: *tsan_fedora_44_amd64_image
   <<: *system_test_tsan_job
   <<: *extra_system_tests_triggering_rules

From 6accf5d7267a228ef1b19f95ca2d0a0460151696 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Sun, 24 May 2026 19:15:52 +0000
Subject: [PATCH 3/4] Remove duplicate <<: *build_job merge in clang:tsan CI
 job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The clang:tsan job merged *build_job twice (lines 1723 and 1729).
The second merge is redundant — copy-paste artifact.

Assisted-by: Claude:claude-opus-4-7
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa6d23a596..9a11d127d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1726,7 +1726,6 @@ clang:tsan:
     CFLAGS: "${CFLAGS_COMMON}"
     LDFLAGS: "-Wl,--disable-new-dtags"
     EXTRA_CONFIGURE: "${TSAN_CONFIGURE_FLAGS_COMMON} -Db_lundef=false --native-file ci/clang-trixie.ini"
-  <<: *build_job
 
 system:clang:tsan:
   variables:

From c05a7003034637d2717355da76cee1dafbc7cbb1 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Sun, 24 May 2026 19:16:17 +0000
Subject: [PATCH 4/4] Add missing autorebase rule to meson-format CI job

The clang-format and coccinelle jobs both include
*rule_branch_after_autorebase in their rules, but meson-format
did not. This meant meson-format would not run after autorebase
operations push new commits.

Assisted-by: Claude:claude-opus-4-7
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a11d127d1..17b4dcdc34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -757,6 +757,7 @@ meson-format:
     - *rule_mr_manual
     - *rule_tag
     - *rule_source_other_than_mr
+    - *rule_branch_after_autorebase
   script:
     - git ls-files "*meson.build" | xargs muon-meson fmt -i
     - git diff > meson-format.patch