From 98bfa22381e76855c6c9a8a7c96e41cecb67bdd0 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 25 Jan 2024 13:46:57 +0100 Subject: [PATCH] Drop FreeBSD 12 Support for FreeBSD 12.4, the last FreeBSD 12.x release, ended on December 31, 2023. Link: https://www.freebsd.org/security/unsupported/ Move the --with-readline=editline ./configure option to FreeBSD 14. --- .gitlab-ci.yml | 35 +---------------------------------- doc/arm/platforms.inc.rst | 2 +- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99699f6a85..91362344c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,10 +205,6 @@ stages: ### QCOW2 Image Templates -.freebsd-12-amd64: &freebsd_12_amd64_image - image: "freebsd-12.4-x86_64" - <<: *libvirt_amd64 - .freebsd-13-amd64: &freebsd_13_amd64_image image: "freebsd-13.2-x86_64" <<: *libvirt_amd64 @@ -1330,32 +1326,6 @@ unit:clang:bookworm:amd64: - job: clang:bookworm:amd64 artifacts: true -# Jobs for Clang builds on FreeBSD 12 (amd64) - -clang:freebsd12:amd64: - variables: - CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE}" - USER: gitlab-runner - <<: *freebsd_12_amd64_image - <<: *build_job - -system:clang:freebsd12:amd64: - <<: *freebsd_12_amd64_image - <<: *system_test_job - variables: - USER: gitlab-runner - needs: - - job: clang:freebsd12:amd64 - artifacts: true - -unit:clang:freebsd12:amd64: - <<: *freebsd_12_amd64_image - <<: *unit_test_job - needs: - - job: clang:freebsd12:amd64 - artifacts: true - # Jobs for Clang builds on FreeBSD 13 (amd64) clang:freebsd13:amd64: @@ -1387,7 +1357,7 @@ unit:clang:freebsd13:amd64: clang:freebsd14:amd64: variables: CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "${WITH_READLINE_LIBEDIT}" + EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE}" USER: gitlab-runner <<: *freebsd_14_amd64_image <<: *build_job @@ -1789,7 +1759,6 @@ stress:rpz:fedora:39:arm64: - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /rpz/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i) stress:authoritative:freebsd12:amd64: - <<: *freebsd_12_amd64_image <<: *freebsd_stress_amd64 <<: *stress_job variables: @@ -1804,7 +1773,6 @@ stress:authoritative:freebsd12:amd64: - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /freebsd/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i) stress:recursive:freebsd12:amd64: - <<: *freebsd_12_amd64_image <<: *freebsd_stress_amd64 <<: *stress_job variables: @@ -1819,7 +1787,6 @@ stress:recursive:freebsd12:amd64: - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /freebsd/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i) stress:rpz:freebsd12:amd64: - <<: *freebsd_12_amd64_image <<: *freebsd_stress_amd64 <<: *stress_job variables: diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst index 8a007e1590..9d6001eb41 100644 --- a/doc/arm/platforms.inc.rst +++ b/doc/arm/platforms.inc.rst @@ -47,7 +47,7 @@ following systems: - Ubuntu LTS 20.04, 22.04 - Fedora 39 - Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9 -- FreeBSD 12.4, 13.2, 14.0 +- FreeBSD 13.2, 14.0 - Alpine Linux 3.19 The amd64 CPU architecture is fully supported and regularly tested.