From 71da3f984e2b444394a9441f63285d245fcbe708 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Tue, 10 Oct 2023 13:59:38 +0200 Subject: [PATCH] Drop Ubuntu 18.04 "bionic" Ubuntu 18.04 LTS (Bionic Beaver) is EOL. Move gcc:bionic:amd64-specific CFLAGS and EXTRA_CONFIGURE to gcc:jammy:amd64. (cherry picked from commit 6d100c4a32422a3bb7c872fda861cfe3e0ed4ae8) --- .gitlab-ci.yml | 27 ++------------------------- doc/arm/platforms.rst | 2 +- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f480dba8f..4bcb54bfcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -189,10 +189,6 @@ stages: # Ubuntu -.ubuntu-bionic-amd64: &ubuntu_bionic_amd64_image - image: "$CI_REGISTRY_IMAGE:ubuntu-bionic-amd64" - <<: *linux_amd64 - .ubuntu-focal-amd64: &ubuntu_focal_amd64_image image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64" <<: *linux_amd64 @@ -993,25 +989,6 @@ unit:gcc:tumbleweed:amd64: - job: gcc:tumbleweed:amd64 artifacts: true -# Jobs for regular GCC builds on Ubuntu 18.04 Bionic Beaver (amd64) - -gcc:bionic:amd64: - variables: - CC: gcc - CFLAGS: "${CFLAGS_COMMON} -O2" - EXTRA_CONFIGURE: "--disable-dnstap --with-gssapi --without-cmocka" - <<: *ubuntu_bionic_amd64_image - <<: *build_job - <<: *api_schedules_tags_triggers_web_triggering_rules - -system:gcc:bionic:amd64: - <<: *ubuntu_bionic_amd64_image - <<: *system_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules - needs: - - job: gcc:bionic:amd64 - artifacts: true - # Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64) gcc:focal:amd64: @@ -1041,8 +1018,8 @@ unit:gcc:focal:amd64: gcc:jammy:amd64: variables: CC: gcc - CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--with-libidn2" + CFLAGS: "${CFLAGS_COMMON} -O2" + EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap --with-gssapi --without-cmocka" <<: *ubuntu_jammy_amd64_image <<: *build_job diff --git a/doc/arm/platforms.rst b/doc/arm/platforms.rst index 534157c596..14708e0e54 100644 --- a/doc/arm/platforms.rst +++ b/doc/arm/platforms.rst @@ -46,7 +46,7 @@ Current versions of BIND 9 are fully supported and regularly tested on the following systems: - Debian 10, 11, 12 -- Ubuntu LTS 18.04, 20.04, 22.04 +- Ubuntu LTS 20.04, 22.04 - Fedora 38 - Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9 - FreeBSD 12.4, 13.2