upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'michal/update-gitlab-ci-to-alpine-linux-3.11' into 'master'

Browse source 
Update GitLab CI to Alpine Linux 3.11

See merge request isc-projects/bind9!2799
This commit is contained in:
Michał Kępień 2020-01-10 11:42:55 +00:00
commit b1b1bae9c1
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.gitlab-ci.yml
View file

@ -67,8 +67,8 @@ stages:
# Alpine Linux
.alpine-3.10-amd64: &alpine_3_10_amd64_image
image: "$CI_REGISTRY_IMAGE:alpine-3.10-amd64"
.alpine-3.11-amd64: &alpine_3_11_amd64_image
image: "$CI_REGISTRY_IMAGE:alpine-3.11-amd64"
<<: *linux_amd64
# CentOS
@ -428,29 +428,29 @@ push:docs:sid:amd64:
- master@isc-projects/bind9
- /^v9_[1-9][0-9]$/@isc-projects/bind9
# Jobs for regular GCC builds on Alpine Linux 3.10 (amd64)
# Jobs for regular GCC builds on Alpine Linux 3.11 (amd64)
gcc:alpine3.10:amd64:
gcc:alpine3.11:amd64:
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--enable-dnstap"
<<: *alpine_3_10_amd64_image
<<: *alpine_3_11_amd64_image
<<: *build_job
system:gcc:alpine3.10:amd64:
<<: *alpine_3_10_amd64_image
system:gcc:alpine3.11:amd64:
<<: *alpine_3_11_amd64_image
<<: *system_test_job
dependencies:
- gcc:alpine3.10:amd64
needs: ["gcc:alpine3.10:amd64"]
- gcc:alpine3.11:amd64
needs: ["gcc:alpine3.11:amd64"]
unit:gcc:alpine3.10:amd64:
<<: *alpine_3_10_amd64_image
unit:gcc:alpine3.11:amd64:
<<: *alpine_3_11_amd64_image
<<: *unit_test_job
dependencies:
- gcc:alpine3.10:amd64
needs: ["gcc:alpine3.10:amd64"]
- gcc:alpine3.11:amd64
needs: ["gcc:alpine3.11:amd64"]
# Jobs for regular GCC builds on CentOS 6 (amd64)