diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98d20ce637..fda31756d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -225,10 +225,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 @@ -1117,39 +1113,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-geoip --with-libidn2 --disable-doh" - <<: *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} -O2" - EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap --without-cmocka --without-gssapi" + EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap --without-cmocka --without-gssapi --disable-geoip --disable-doh" <<: *ubuntu_jammy_amd64_image <<: *build_job diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst index b1bd475f7f..9203ee0809 100644 --- a/doc/arm/platforms.inc.rst +++ b/doc/arm/platforms.inc.rst @@ -46,7 +46,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 @@ -89,13 +89,12 @@ supported platforms. - Platforms past or close to their respective EOL dates, such as: - - Ubuntu 14.04, 16.04 (Ubuntu ESM releases are not supported) + - Ubuntu 14.04, 16.04, 18.04, 20.04 (Ubuntu ESM releases are not supported) - CentOS 6 - Debian 8 Jessie, 9 Stretch, 10 Buster, 11 Bullseye - - Ubuntu 14.04, 16.04, 18.04 (Ubuntu ESM releases are not supported) - Red Hat Enterprise Linux / CentOS / Oracle Linux 6, 7 - Debian 8 Jessie, 9 Stretch, 10 Buster - - FreeBSD 10.x, 11.x + - FreeBSD 10.x, 11.x, 12.x - Less common CPU architectures (i386, i686, mips, mipsel, sparc, ppc, and others)