From 0291dead5deba6b95ce1f363470733bad8b47969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 1 Oct 2019 16:29:33 +0200
Subject: [PATCH 1/3] Fix docs -> autoreconf dependencies in the .gitlab-ci.yml

(cherry picked from commit cc4c5482ef4053a6fb2b1af8b27e496c7dd94071)
---
 .gitlab-ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5736c3fe8..e6a4ed7b14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,6 +126,14 @@ stages:
     - tags
     - web
 
+.release-branch-triggering-rules: &release_branch_triggering_rules
+  only:
+    - merge_requests
+    - tags
+    - web
+    - master@isc-projects/bind9
+    - /^v9_[1-9][0-9]$/@isc-projects/bind9
+
 .precheck: &precheck_job
   <<: *default_triggering_rules
   <<: *debian_sid_amd64_image
@@ -267,6 +275,7 @@ stages:
 # Jobs in the precheck stage
 
 autoreconf:sid:amd64:
+  <<: *release_branch_triggering_rules
   <<: *autoconf_job
 
 misc:sid:amd64:
@@ -302,6 +311,7 @@ misc:sid:amd64:
 # Jobs for doc builds on Debian Sid (amd64)
 
 docs:sid:amd64:
+  <<: *release_branch_triggering_rules
   <<: *debian_sid_amd64_image
   stage: docs
   script:
@@ -315,12 +325,6 @@ docs:sid:amd64:
     paths:
       - doc/arm/
     expire_in: "1 month"
-  only:
-    - merge_requests
-    - tags
-    - web
-    - master@isc-projects/bind9
-    - /^v9_[1-9][0-9]$/@isc-projects/bind9
 
 push:docs:sid:amd64:
   <<: *debian_sid_amd64_image

From 6e78ede6cf2f25ee9b0bc367d8ef0d3566b873e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 1 Oct 2019 16:42:33 +0200
Subject: [PATCH 2/3] Fix the triggering rule for autoreconf job (take 2)

(cherry picked from commit 3b339eb43f1350b0e26e09c51edcbd4becacfec3)
---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6a4ed7b14..710ca40ccd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,7 @@ stages:
   stage: precheck
 
 .autoconf: &autoconf_job
-  <<: *default_triggering_rules
+  <<: *release_branch_triggering_rules
   <<: *debian_sid_amd64_image
   stage: precheck
   script:
@@ -275,7 +275,6 @@ stages:
 # Jobs in the precheck stage
 
 autoreconf:sid:amd64:
-  <<: *release_branch_triggering_rules
   <<: *autoconf_job
 
 misc:sid:amd64:

From af4bccd6a8a1800e078c18afb78ce2dd0b6f02de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Thu, 17 Oct 2019 12:07:31 +0200
Subject: [PATCH 3/3] Revert "fix docs:sid:amd64: needs"

This reverts commit 26e802853ef538553b73c1ab0a517cd38d259903.
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 710ca40ccd..4b8e75f2bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -319,7 +319,8 @@ docs:sid:amd64:
     - make -C doc/arm Bv9ARM.html
   dependencies:
     - autoreconf:sid:amd64
-  needs: ["autoreconf:sid:amd64"]
+  needs:
+    - autoreconf:sid:amd64
   artifacts:
     paths:
       - doc/arm/