From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 8 Jun 2022 13:16:37 +0000 (+0200)
Subject: ci: Remove unsupported platforms
X-Git-Tag: v4.7~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c807ef4f33e09da09f98592c680be1523a2980f;p=thirdparty%2Fccache.git

ci: Remove unsupported platforms
---

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f5495a35b..3850a7d59 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,14 +22,6 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - os: ubuntu-18.04
-            compiler: gcc
-            version: "7"
-
-          - os: ubuntu-18.04
-            compiler: gcc
-            version: "8"
-
           - os: ubuntu-18.04
             compiler: gcc
             version: "9"
@@ -74,10 +66,6 @@ jobs:
             compiler: gcc
             version: "11"
 
-          - os: macOS-10.15
-            compiler: xcode
-            version: "10.3"
-
           - os: macOS-10.15
             compiler: xcode
             version: "11.7"
diff --git a/dockerfiles/ubuntu-18.04/Dockerfile b/dockerfiles/ubuntu-18.04/Dockerfile
index 02df590d5..49ae973bf 100644
--- a/dockerfiles/ubuntu-18.04/Dockerfile
+++ b/dockerfiles/ubuntu-18.04/Dockerfile
@@ -17,7 +17,10 @@ RUN apt-get update \
         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 \