diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb21f39f69..d074a49f07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,10 +129,6 @@ stages: # Oracle Linux -.oraclelinux-7-amd64: &oraclelinux_7_amd64_image - image: "$CI_REGISTRY_IMAGE:oraclelinux-7-amd64" - <<: *linux_amd64 - .oraclelinux-8-amd64: &oraclelinux_8_amd64_image image: "$CI_REGISTRY_IMAGE:oraclelinux-8-amd64" <<: *linux_amd64 @@ -783,31 +779,6 @@ unit:gcc:alpine3.20:amd64: - job: gcc:alpine3.20:amd64 artifacts: true -# Jobs for regular GCC builds on Oracle Linux 7 (amd64) - -gcc:oraclelinux7:amd64: - variables: - CC: gcc - CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--with-libidn2" - <<: *oraclelinux_7_amd64_image - <<: *build_job - -system:gcc:oraclelinux7:amd64: - <<: *oraclelinux_7_amd64_image - <<: *system_test_job - <<: *system_test_legacy - needs: - - job: gcc:oraclelinux7:amd64 - artifacts: true - -unit:gcc:oraclelinux7:amd64: - <<: *oraclelinux_7_amd64_image - <<: *unit_test_job - needs: - - job: gcc:oraclelinux7:amd64 - artifacts: true - # Jobs for regular GCC builds on Oracle Linux 8 (amd64) gcc:oraclelinux8:amd64: diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst index 7be112dbb4..219f25be00 100644 --- a/doc/arm/platforms.inc.rst +++ b/doc/arm/platforms.inc.rst @@ -48,7 +48,7 @@ following systems: - Debian 12 - Ubuntu LTS 20.04, 22.04, 24.04 - Fedora 40 -- Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9 +- Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9 - FreeBSD 13.3, 14.0 - Alpine Linux 3.20