diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fc91fe1d3..6bd23d9613 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -230,10 +230,6 @@ stages: # Ubuntu -.ubuntu-focal-amd64: &ubuntu_focal_amd64_image - image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64" - <<: *linux_amd64 - .ubuntu-jammy-amd64: &ubuntu_jammy_amd64_image image: "$CI_REGISTRY_IMAGE:ubuntu-jammy-amd64" <<: *linux_amd64 @@ -1194,39 +1190,13 @@ unit:gcc:tumbleweed:amd64: - job: gcc:tumbleweed:amd64 artifacts: true -# Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64) - -gcc:focal:amd64: - variables: - CC: gcc - CFLAGS: "${CFLAGS_COMMON} -Og" - EXTRA_CONFIGURE: "--disable-dnstap --without-cmocka --without-gssapi --with-libidn2" - <<: *ubuntu_focal_amd64_image - <<: *build_job - -system:gcc:focal:amd64: - <<: *ubuntu_focal_amd64_image - <<: *system_test_job - <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules - needs: - - job: gcc:focal:amd64 - artifacts: true - -unit:gcc:focal:amd64: - <<: *ubuntu_focal_amd64_image - <<: *unit_test_job - <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules - needs: - - job: gcc:focal:amd64 - artifacts: true - # Jobs for regular GCC builds on Ubuntu 22.04 Jammy Jellyfish (amd64) gcc:jammy:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--disable-geoip --with-libidn2 --disable-doh" + EXTRA_CONFIGURE: "--disable-geoip --with-libidn2 --disable-doh --disable-dnstap --without-cmocka --without-gssapi" <<: *ubuntu_jammy_amd64_image <<: *build_job diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst index 03ce969462..fad14e89c7 100644 --- a/doc/arm/platforms.inc.rst +++ b/doc/arm/platforms.inc.rst @@ -44,7 +44,7 @@ Current versions of BIND 9 are fully supported and regularly tested on the following systems: - Debian 12 -- Ubuntu LTS 20.04, 22.04, 24.04 +- Ubuntu LTS 22.04, 24.04 - Fedora 42 - Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9 - FreeBSD 13.4, 14.2 @@ -87,7 +87,7 @@ supported platforms. - Platforms past or close to their respective EOL dates, such as: - - Ubuntu 14.04, 16.04, 18.04 (Ubuntu ESM releases are not supported) + - Ubuntu 14.04, 16.04, 18.04, 20.04 (Ubuntu ESM releases are not supported) - Red Hat Enterprise Linux / CentOS / Oracle Linux 6, 7 - Debian 8 Jessie, 9 Stretch, 10 Buster, 11 Bullseye - FreeBSD 10.x, 11.x