Merge branch 'mnowak/alpine-3.14-v9_11' into 'v9_11'

[v9_11] Add Alpine Linux 3.14

See merge request isc-projects/bind9!5193
This commit is contained in:
Michal Nowak 2021-06-17 16:25:34 +00:00
commit f725c7d2db

View file

@ -94,8 +94,8 @@ stages:
# Alpine Linux
.alpine-3.13-amd64: &alpine_3_13_amd64_image
image: "$CI_REGISTRY_IMAGE:alpine-3.13-amd64"
.alpine-3.14-amd64: &alpine_3_14_amd64_image
image: "$CI_REGISTRY_IMAGE:alpine-3.14-amd64"
<<: *linux_amd64
# CentOS
@ -561,27 +561,27 @@ push:docs:
- main@isc-projects/bind9
- /^v9_[1-9][0-9]$/@isc-projects/bind9
# Jobs for regular GCC builds on Alpine Linux 3.13 (amd64)
# Jobs for regular GCC builds on Alpine Linux 3.14 (amd64)
gcc:alpine3.13:amd64:
gcc:alpine3.14:amd64:
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON}"
<<: *alpine_3_13_amd64_image
<<: *alpine_3_14_amd64_image
<<: *build_job
system:gcc:alpine3.13:amd64:
<<: *alpine_3_13_amd64_image
system:gcc:alpine3.14:amd64:
<<: *alpine_3_14_amd64_image
<<: *system_test_job
needs:
- job: gcc:alpine3.13:amd64
- job: gcc:alpine3.14:amd64
artifacts: true
unit:gcc:alpine3.13:amd64:
<<: *alpine_3_13_amd64_image
unit:gcc:alpine3.14:amd64:
<<: *alpine_3_14_amd64_image
<<: *unit_test_job
needs:
- job: gcc:alpine3.13:amd64
- job: gcc:alpine3.14:amd64
artifacts: true
# Jobs for regular GCC builds on CentOS 6 (i386)