diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 212d3c9b..7e828409 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,11 +45,6 @@ builder ubuntu base: variables: DOCKER_BASE_IMAGE: ubuntu:bionic -builder fedora-29 base: - <<: *docker_base_builder - variables: - DOCKER_BASE_IMAGE: fedora:29 - builder fedora-31 base: <<: *docker_base_builder variables: @@ -89,8 +84,6 @@ builder ubuntu gcc-7: *docker_builder builder ubuntu gcc-8: *docker_builder builder ubuntu gcc-9: *docker_builder builder ubuntu gcc-10: *docker_builder -builder fedora-29 gcc-8: *docker_builder -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 @@ -203,26 +196,6 @@ ubuntu gcc-10: CC: gcc-10 CXX: g++-10 -fedora-29 gcc-8: - <<: *build_stages - variables: - <<: *build_variables - DISTRO: fedora-29 - COMPILER: gcc-8 - CC: gcc - CXX: g++ - BUILD_AUDACIOUS: "OFF" - -fedora-29 clang-7: - <<: *build_stages - variables: - <<: *build_variables - DISTRO: fedora-29 - COMPILER: clang-7 - CC: clang - CXX: clang++ - BUILD_AUDACIOUS: "OFF" - fedora-31 clang-8: <<: *build_stages variables: @@ -473,24 +446,6 @@ test ubuntu gcc-10: CC: gcc-10 CXX: g++-10 -test fedora-29 gcc-8: - <<: *test_stages - <<: *test_run - variables: - DISTRO: fedora-29 - COMPILER: gcc-8 - CC: gcc - CXX: g++ - -test fedora-29 clang-7: - <<: *test_stages - <<: *test_run - variables: - DISTRO: fedora-29 - COMPILER: clang-7 - CC: clang - CXX: clang++ - test fedora-31 clang-8: <<: *test_stages <<: *test_run diff --git a/tests/dockerfiles/Dockerfile.fedora-29-base b/tests/dockerfiles/Dockerfile.fedora-29-base deleted file mode 100644 index 1aa62962..00000000 --- a/tests/dockerfiles/Dockerfile.fedora-29-base +++ /dev/null @@ -1,36 +0,0 @@ -FROM fedora:29 - -RUN dnf update -y -q \ - && dnf -y -q install \ - audacious-devel \ - cairo-devel \ - cmake \ - dbus-glib-devel \ - docbook2X \ - freetype-devel \ - 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 \ - libXNVCtrl-devel \ - lua-devel \ - make \ - man \ - mysql-devel \ - ncurses-devel \ - openssl-devel \ - patch \ - pulseaudio-libs-devel \ - readline-devel \ - systemd-devel \ - xmms2-devel diff --git a/tests/dockerfiles/Dockerfile.fedora-29-clang-7 b/tests/dockerfiles/Dockerfile.fedora-29-clang-7 deleted file mode 100644 index c39da584..00000000 --- a/tests/dockerfiles/Dockerfile.fedora-29-clang-7 +++ /dev/null @@ -1,15 +0,0 @@ -ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky -FROM ${IMAGE}/builder/fedora-29-base:latest - -RUN dnf -y -q install \ - llvm \ - clang \ - libcxx-devel \ - libcxxabi-devel \ - && curl -Ls https://rpm.nodesource.com/setup_11.x -o npm.sh \ - && bash npm.sh \ - && rm npm.sh \ - && dnf -y -q install npm \ - && dnf clean all \ - && npm install -g lcov-summary \ - && npm cache clean --force diff --git a/tests/dockerfiles/Dockerfile.fedora-29-gcc-8 b/tests/dockerfiles/Dockerfile.fedora-29-gcc-8 deleted file mode 100644 index c18e4cd2..00000000 --- a/tests/dockerfiles/Dockerfile.fedora-29-gcc-8 +++ /dev/null @@ -1,7 +0,0 @@ -ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky -FROM ${IMAGE}/builder/fedora-29-base:latest - -RUN dnf -qy install \ - gcc \ - gcc-c++ \ - && dnf clean all