From ebc6dbbe00eeca90ddd053762769f7d160a8a7cc Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 27 Feb 2021 10:24:09 -0600 Subject: [PATCH] RIP CentOS. --- .gitlab-ci.yml | 88 -------------------- tests/dockerfiles/Dockerfile.centos7-base | 63 -------------- tests/dockerfiles/Dockerfile.centos7-clang-5 | 8 -- tests/dockerfiles/Dockerfile.centos7-gcc-7 | 6 -- tests/dockerfiles/Dockerfile.centos7-gcc-8 | 6 -- 5 files changed, 171 deletions(-) delete mode 100644 tests/dockerfiles/Dockerfile.centos7-base delete mode 100644 tests/dockerfiles/Dockerfile.centos7-clang-5 delete mode 100644 tests/dockerfiles/Dockerfile.centos7-gcc-7 delete mode 100644 tests/dockerfiles/Dockerfile.centos7-gcc-8 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 748a16df..212d3c9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,11 +65,6 @@ builder fedora-33 base: variables: DOCKER_BASE_IMAGE: fedora:33 -builder centos7 base: - <<: *docker_base_builder - variables: - DOCKER_BASE_IMAGE: centos:7 - .docker_builder: &docker_builder <<: *docker_base_builder stage: dependencies @@ -99,9 +94,6 @@ builder fedora-29 clang-7: *docker_builder builder fedora-31 clang-8: *docker_builder builder fedora-32 clang-10: *docker_builder builder fedora-33 clang-11: *docker_builder -builder centos7 gcc-7: *docker_builder -builder centos7 gcc-8: *docker_builder -builder centos7 clang-5: *docker_builder .build_stages: &build_stages retry: @@ -261,53 +253,6 @@ fedora-33 clang-11: CXX: clang++ BUILD_AUDACIOUS: "OFF" -centos7 gcc-7: - <<: *build_stages - variables: - <<: *build_variables - DISTRO: centos7 - COMPILER: gcc-7 - CC: gcc - CXX: g++ - CMAKE: cmake3 - BUILD_AUDACIOUS: "OFF" - BUILD_XMMS2: "OFF" - BUILD_NVIDIA: "OFF" - BUILD_JOURNAL: "OFF" - before_script: - - source /opt/rh/devtoolset-7/enable - -centos7 gcc-8: - <<: *build_stages - variables: - <<: *build_variables - DISTRO: centos7 - COMPILER: gcc-8 - CC: gcc - CXX: g++ - CMAKE: cmake3 - BUILD_AUDACIOUS: "OFF" - BUILD_XMMS2: "OFF" - BUILD_NVIDIA: "OFF" - BUILD_JOURNAL: "OFF" - before_script: - - source /opt/rh/devtoolset-8/enable - -centos7 clang-5: - <<: *build_stages - variables: - <<: *build_variables - DISTRO: centos7 - COMPILER: clang-5 - CC: clang - CXX: clang++ - BUILD_AUDACIOUS: "OFF" - BUILD_XMMS2: "OFF" - BUILD_NVIDIA: "OFF" - BUILD_JOURNAL: "OFF" - before_script: - - source /opt/rh/llvm-toolset-7/enable - # .freebsd_deps: &freebsd_deps # retry: # max: 2 @@ -573,39 +518,6 @@ test fedora-33 clang-11: CC: clang CXX: clang++ -test centos7 clang-5: - <<: *test_stages - <<: *test_run - variables: - DISTRO: centos7 - COMPILER: clang-5 - CC: clang - CXX: clang++ - before_script: - - source /opt/rh/llvm-toolset-7/enable - -test centos7 gcc-7: - <<: *test_stages - <<: *test_run - variables: - DISTRO: centos7 - COMPILER: gcc-7 - CC: gcc - CXX: g++ - before_script: - - source /opt/rh/devtoolset-7/enable - -test centos7 gcc-8: - <<: *test_stages - <<: *test_run - variables: - DISTRO: centos7 - COMPILER: gcc-8 - CC: gcc - CXX: g++ - before_script: - - source /opt/rh/devtoolset-8/enable - # test freebsd12 clang-7: # <<: *freebsd_deps # <<: *test_run diff --git a/tests/dockerfiles/Dockerfile.centos7-base b/tests/dockerfiles/Dockerfile.centos7-base deleted file mode 100644 index 26267c01..00000000 --- a/tests/dockerfiles/Dockerfile.centos7-base +++ /dev/null @@ -1,63 +0,0 @@ -FROM centos:7 - -RUN yum update -y -q \ - && yum -y -q install \ - epel-release \ - centos-release-scl \ - && yum -y -q install \ - cairo-devel \ - dbus-glib-devel \ - docbook2X \ - freetype-devel \ - gcc \ - git \ - imlib2-devel \ - lcov \ - libcurl-devel \ - libical-devel \ - libircclient-devel \ - libmicrohttpd-devel \ - librsvg2-devel \ - libX11-devel \ - libXdamage-devel \ - libXext-devel \ - libXft-devel \ - libXinerama-devel \ - libxml2-devel \ - make \ - man \ - mysql-devel \ - ncurses-devel \ - openssl-devel \ - patch \ - pulseaudio-libs-devel \ - readline-devel \ - && curl -L https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.sh -o cmake-3.13.4-Linux-x86_64.sh \ - && chmod +x cmake-3.13.4-Linux-x86_64.sh \ - && ./cmake-3.13.4-Linux-x86_64.sh --prefix=/usr --skip-license \ - && rm cmake-3.13.4-Linux-x86_64.sh \ - && mkdir /luabuild \ - && pushd /luabuild \ - && curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz \ - && tar zxf lua-5.3.5.tar.gz \ - && cd lua-5.3.5 \ - && make -j4 linux MYCFLAGS=-fPIC MYLDFLAGS=-fPIC \ - && make install INSTALL_TOP=/usr \ - && popd \ - && rm -rf /luabuild \ - && mkdir -p /usr/lib/pkgconfig \ - && echo $'\ - V= 5.3\n\ - R= 5.3.5\n\ - prefix= /usr\n\ - exec_prefix=${prefix}\n\ - libdir= /usr/lib\n\ - includedir=${prefix}/include\n\ - \n\ - Name: Lua\n\ - Description: An Extensible Extension Language\n\ - Version: ${R}\n\ - Requires:\n\ - Libs: -llua -lm -ldl\n\ - Cflags: -I${includedir}' \ - >> /usr/lib64/pkgconfig/lua.pc diff --git a/tests/dockerfiles/Dockerfile.centos7-clang-5 b/tests/dockerfiles/Dockerfile.centos7-clang-5 deleted file mode 100644 index 66c9899c..00000000 --- a/tests/dockerfiles/Dockerfile.centos7-clang-5 +++ /dev/null @@ -1,8 +0,0 @@ -ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky -FROM ${IMAGE}/builder/centos7-base:latest - -RUN yum -y -q install \ - llvm-toolset-7-clang \ - llvm-toolset-7-llvm \ - llvm-toolset-7-clang-tools-extra \ - && yum clean all diff --git a/tests/dockerfiles/Dockerfile.centos7-gcc-7 b/tests/dockerfiles/Dockerfile.centos7-gcc-7 deleted file mode 100644 index a605b277..00000000 --- a/tests/dockerfiles/Dockerfile.centos7-gcc-7 +++ /dev/null @@ -1,6 +0,0 @@ -ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky -FROM ${IMAGE}/builder/centos7-base:latest - -RUN yum -y -q install \ - devtoolset-7 \ - && yum clean all diff --git a/tests/dockerfiles/Dockerfile.centos7-gcc-8 b/tests/dockerfiles/Dockerfile.centos7-gcc-8 deleted file mode 100644 index f0314429..00000000 --- a/tests/dockerfiles/Dockerfile.centos7-gcc-8 +++ /dev/null @@ -1,6 +0,0 @@ -ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky -FROM ${IMAGE}/builder/centos7-base:latest - -RUN yum -y -q install \ - devtoolset-8 \ - && yum clean all