From 387fbbd4dfd2fa3ed66ea9f1b5dcdbcbf07fb2ed Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Wed, 16 Jun 2021 17:39:44 +0200 Subject: [PATCH] Add Alpine Linux 3.14 (cherry picked from commit 80f828bc3741ee3ba304b5d36dd1f79fc2ad77c1) --- .gitlab-ci.yml | 22 +++++++++++----------- PLATFORMS | 2 +- PLATFORMS.md | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b26325a43e..f5a3c6938e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,8 +98,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 @@ -567,27 +567,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 7 (amd64) diff --git a/PLATFORMS b/PLATFORMS index 23fc9ec70b..977e7a5ece 100644 --- a/PLATFORMS +++ b/PLATFORMS @@ -43,7 +43,7 @@ following systems: * Red Hat Enterprise Linux / CentOS 7, 8 * FreeBSD 11.4, 12.2, 13.0 * OpenBSD 6.9 - * Alpine Linux 3.13 + * Alpine Linux 3.14 The amd64, i386, armhf and arm64 CPU architectures are all fully supported. diff --git a/PLATFORMS.md b/PLATFORMS.md index 8e4c723c07..fa02b57cfe 100644 --- a/PLATFORMS.md +++ b/PLATFORMS.md @@ -51,7 +51,7 @@ following systems: * Red Hat Enterprise Linux / CentOS 7, 8 * FreeBSD 11.4, 12.2, 13.0 * OpenBSD 6.9 -* Alpine Linux 3.13 +* Alpine Linux 3.14 The amd64, i386, armhf and arm64 CPU architectures are all fully supported.