From: Michal Nowak Date: Mon, 19 Aug 2024 14:32:36 +0000 (+0200) Subject: Drop Oracle Linux 7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=525159ace68f532c93e45f831dd8bcae0c0c025e;p=thirdparty%2Fbind9.git Drop Oracle Linux 7 (cherry picked from commit 4af28f9ffcc9375e0b71293ede17c7be79068cd5) --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c3e1cf7f31..ac59eda1578 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,10 +93,6 @@ stages: image: "$CI_REGISTRY_IMAGE:centos-centos6-amd64" <<: *linux_amd64 -.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 @@ -475,30 +471,6 @@ unit:gcc:centos6:amd64: - job: gcc:centos6: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 - 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: