From a949e3760217f8f66f605cca34483952030e562e Mon Sep 17 00:00:00 2001 From: Nathaniel Filardo Date: Wed, 21 Apr 2021 14:27:29 +0100 Subject: [PATCH] ci: move linux_x64 to Ubuntu 20.04 LTS This brings us clang 10 and its understanding of C++20 as a standard (rather than it being called c++2a in earlier versions). Ubuntu folded together clang-N and clang++-N into the former, so adjust the names of packages to be installed. --- ci/linux_x64 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/linux_x64 b/ci/linux_x64 index 62b9a2d..88552a0 100644 --- a/ci/linux_x64 +++ b/ci/linux_x64 @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 RUN apt update \ && apt install -y software-properties-common \ @@ -6,9 +6,10 @@ RUN apt update \ && apt update \ && apt install --no-install-recommends -y sudo cmake ninja-build git \ && apt install --no-install-recommends -y g++-8 \ - && apt install --no-install-recommends -y clang++-7 \ - && apt install --no-install-recommends -y clang++-8 \ - && apt install --no-install-recommends -y clang++-9 \ + && apt install --no-install-recommends -y clang-7 \ + && apt install --no-install-recommends -y clang-8 \ + && apt install --no-install-recommends -y clang-9 \ + && apt install --no-install-recommends -y clang-10 \ && apt install --no-install-recommends -y clang-format-9 clang-tidy-9 \ && update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-9 100 \ && apt remove -y software-properties-common \