Merge branch 'ondrej/fix-gitlab-ci-for-master-branch' into 'master'

Fix docs -> autoreconf dependencies in the .gitlab-ci.yml

See merge request isc-projects/bind9!2423
This commit is contained in:
Ondřej Surý 2019-10-01 10:32:27 -04:00
commit 7b33f048b0

View file

@ -118,6 +118,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
@ -218,6 +226,7 @@ stages:
# Jobs in the precheck stage
autoreconf:sid:amd64:
<<: *release_branch_triggering_rules
<<: *autoconf_job
misc:sid:amd64:
@ -253,6 +262,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:
@ -267,12 +277,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