From 6c2827eac6cc72de5d1c986261b90f2ef9e84485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 11 May 2022 14:10:17 +0200
Subject: [PATCH 1/2] Do not trigger GitLab Pages pipelines any more

The bind.isc.org microsite no longer downloads documentation from
GitLab, instead linking to Read the Docs for all currently maintained
branches.  This makes it redundant to trigger GitLab Pages pipelines
after each merge to any of the maintained branches.  Revert changes
introduced by commit 31bde118db8cae4a0f5a9484e3beead66fcc24d0: remove
the "push:docs" job along with the "push" stage it is associated with
and revert artifact expiry time for the "docs" job to the default value.

(cherry picked from commit a7fccaee822493dff7e9fb2773f1bae600f447e5)
---
 .gitlab-ci.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8f1799dce..582115a339 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,6 @@ stages:
   - system
   - performance
   - docs
-  - push
   - postcheck
   - release
 
@@ -527,7 +526,6 @@ tarball-create:
       artifacts: true
 
 # Jobs for doc builds on Debian 11 "bullseye" (amd64)
-# Long "docs" job artifact retention is needed for bind.isc.org web site
 
 docs:
   <<: *release_branch_triggering_rules
@@ -540,7 +538,6 @@ docs:
       artifacts: true
   artifacts:
     untracked: true
-    expire_in: "1 month"
 
 docs:tarball:
   <<: *default_triggering_rules
@@ -553,18 +550,6 @@ docs:tarball:
     - job: tarball-create
       artifacts: true
 
-push:docs:
-  <<: *base_image
-  stage: push
-  needs:
-    - job: docs
-      artifacts: false
-  script:
-    - curl -X POST -F token=$GITLAB_PAGES_DOCS_TRIGGER_TOKEN -F ref=main $GITLAB_PAGES_DOCS_TRIGGER_URL
-  only:
-    - main@isc-projects/bind9
-    - /^v9_[1-9][0-9]$/@isc-projects/bind9
-
 # Jobs for regular GCC builds on Alpine Linux 3.15 (amd64)
 
 gcc:alpine3.15:amd64:

From 6d1d244f17b3d165dcea6ac25d1b619614a9f68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 11 May 2022 14:10:17 +0200
Subject: [PATCH 2/2] Do not set up ccache in CI jobs building docs

Building documentation for Automake-based BIND 9 versions does not
require running "make all" beforehand.  Drop ccache setup code from the
definitions of GitLab CI jobs building documentation as it is redundant.

(cherry picked from commit 59c8321ac9e812978e6594fc8ce2c3ab17030356)
---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 582115a339..f0138a45d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -531,8 +531,6 @@ docs:
   <<: *release_branch_triggering_rules
   <<: *base_image
   <<: *docs_job
-  before_script:
-    - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
   needs:
     - job: autoreconf
       artifacts: true
@@ -544,7 +542,6 @@ docs:tarball:
   <<: *base_image
   <<: *docs_job
   before_script:
-    - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
     - *unpack_release_tarball
   needs:
     - job: tarball-create