mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
fix: ci: Misc .gitlab-ci.yml fixes
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 Merge branch 'mnowak/fix-gitlab-ci' into 'main' See merge request isc-projects/bind9!12093
This commit is contained in:
commit
90b44f0bc5
1 changed files with 2 additions and 5 deletions
|
|
@ -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
|
||||
|
|
@ -766,10 +767,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
|
||||
|
|
@ -1704,6 +1701,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
|
||||
|
|
@ -1729,7 +1727,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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue