From 3d59d61291eb93e261e2692c9124b49cc9f2212b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 11 May 2022 14:59:47 +0200 Subject: [PATCH] Drop post-merge pipelines Commit 24961f606882939b62f461f843933da9c2d44ea8 introduced the concept of post-merge pipelines. These were used to build documentation after each merge to any of the maintained branches, to allow up-to-date documentation to be subsequently published on the bind.isc.org microsite. As the latter no longer downloads documentation from GitLab, instead linking to Read the Docs for all currently maintained branches, post-merge pipelines have become redundant since running the "autoreconf" and "docs" jobs after each merge is not necessary any more. Drop the "release_branch_triggering_rules" YAML anchor and revert to default triggering rules for the "autoconf" and "docs" jobs, effectively preventing pipelines from being created after each merge to any of the maintained branches. (cherry picked from commit 7b8c9e04fc6f1db1355499d7e2a8c4b06e117861) --- .gitlab-ci.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0138a45d7..193b08ff13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -198,17 +198,6 @@ stages: - web - schedules -.release-branch-triggering-rules: &release_branch_triggering_rules - only: - - api - - merge_requests - - tags - - triggers - - web - - schedules - - main@isc-projects/bind9 - - /^v9_[1-9][0-9]$/@isc-projects/bind9 - .schedules-tags-web-triggering-rules: &schedules_tags_web_triggering_rules only: - api @@ -223,7 +212,7 @@ stages: stage: precheck .autoconf: &autoconf_job - <<: *release_branch_triggering_rules + <<: *default_triggering_rules <<: *base_image stage: autoconf script: @@ -528,7 +517,7 @@ tarball-create: # Jobs for doc builds on Debian 11 "bullseye" (amd64) docs: - <<: *release_branch_triggering_rules + <<: *default_triggering_rules <<: *base_image <<: *docs_job needs: