From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 17 Mar 2024 14:57:02 +0000 (+0100)
Subject: chore: Remove unsupported ubuntu-18.04 build from misc/test-all-systems
X-Git-Tag: v4.10~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333c567e500045540bc6bcff9f19cf99b9a909f3;p=thirdparty%2Fccache.git

chore: Remove unsupported ubuntu-18.04 build from misc/test-all-systems
---

diff --git a/dockerfiles/ubuntu-18.04/Dockerfile b/dockerfiles/ubuntu-18.04/Dockerfile
deleted file mode 100644
index 49ae973bf..000000000
--- a/dockerfiles/ubuntu-18.04/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-        asciidoctor \
-        bash \
-        build-essential \
-        ccache \
-        clang \
-        docbook-xml \
-        docbook-xsl \
-        elfutils \
-        gcc-multilib \
-        gpg \
-        libhiredis-dev \
-        libzstd-dev \
-        python3 \
-        redis-server \
-        redis-tools \
-        software-properties-common \
-        wget \
- && add-apt-repository ppa:ubuntu-toolchain-r/test \
- && apt install -y --no-install-recommends g++-9 \
- && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - >/usr/share/keyrings/kitware-archive-keyring.gpg \
- && echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' >/etc/apt/sources.list.d/kitware.list \
- && apt-get update \
- && apt-get install -y --no-install-recommends cmake \
- && rm -rf /var/lib/apt/lists/*
-
-# Redirect all compilers to ccache.
-RUN for t in gcc g++ cc c++ clang clang++; do ln -vs /usr/bin/ccache /usr/local/bin/$t; done
diff --git a/misc/test-all-systems b/misc/test-all-systems
index 85812a4f1..a79396013 100755
--- a/misc/test-all-systems
+++ b/misc/test-all-systems
@@ -28,9 +28,6 @@ build() {
 build debian-11    gcc    g++     gcc
 build debian-11    clang  clang++ clang
 
-build ubuntu-18.04 gcc-9  g++-9   gcc
-build ubuntu-18.04 clang  clang++ clang
-
 build ubuntu-20.04 gcc    g++     gcc
 build ubuntu-20.04 clang  clang++ clang