From: Ondřej Surý <ondrej@isc.org>
Date: Wed, 17 Jun 2020 11:33:31 +0000 (+0200)
Subject: Adjust the GitLab CI scripts for new default branch name
X-Git-Tag: v9.11.21~15^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=280720b151302a4a9f0f7ee45d571d774bc997a8;p=thirdparty%2Fbind9.git

Adjust the GitLab CI scripts for new default branch name

(cherry picked from commit b36cd06a0b61f617061c34f149d5df17bcf7230e)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1e2b51a63b..65184e31399 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,7 +156,7 @@ stages:
     - tags
     - web
     - schedules
-    - master@isc-projects/bind9
+    - main@isc-projects/bind9
     - /^v9_[1-9][0-9]$/@isc-projects/bind9
 
 .precheck: &precheck_job
@@ -502,9 +502,9 @@ push:docs:
     - job: docs
       artifacts: false
   script:
-    - curl -X POST -F token=$GITLAB_PAGES_DOCS_TRIGGER_TOKEN -F ref=master $GITLAB_PAGES_DOCS_TRIGGER_URL
+    - curl -X POST -F token=$GITLAB_PAGES_DOCS_TRIGGER_TOKEN -F ref=main $GITLAB_PAGES_DOCS_TRIGGER_URL
   only:
-    - master@isc-projects/bind9
+    - main@isc-projects/bind9
     - /^v9_[1-9][0-9]$/@isc-projects/bind9
 
 # Jobs for regular GCC builds on Alpine Linux 3.11 (amd64)
@@ -1387,5 +1387,5 @@ abi-check:
       - "abi-*.dump"
     expire_in: "1 week"
   only:
-    - master@isc-projects/bind9
+    - main@isc-projects/bind9
     - /^v9_[1-9][0-9]$/@isc-projects/bind9