From d22cab2e11f4d89641e4578b381256501b2e3fc3 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Wed, 22 Feb 2023 19:48:01 +0100 Subject: [PATCH] [libc++][CI] Improves Dockerfile - Remove temporary apt files - Removes LLVM16 TODO Reviewed By: #libc, ldionne Differential Revision: https://reviews.llvm.org/D144575 --- libcxx/utils/ci/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index 083ab58..aa719d8 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -76,14 +76,14 @@ RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 2)) RUN apt-get update && apt-get install -y llvm-$(($LLVM_HEAD_VERSION - 1))-dev llvm-$(($LLVM_HEAD_VERSION - 2))-dev \ libclang-$(($LLVM_HEAD_VERSION - 1))-dev libclang-$(($LLVM_HEAD_VERSION - 2))-dev -# TODO LLVM16 Don't install llvm-16-dev explicitly -RUN apt-get update && apt-get install -y llvm-16-dev libclang-16-dev - # Install the most recent GCC, like clang install the previous version as a transition. ENV GCC_LATEST_VERSION=12 RUN apt-get update && apt install -y gcc-$((GCC_LATEST_VERSION - 1)) g++-$((GCC_LATEST_VERSION - 1)) RUN apt-get update && apt install -y gcc-$GCC_LATEST_VERSION g++-$GCC_LATEST_VERSION +# Remove all, no longer needed, apt data +RUN rm -rf /var/lib/apt/lists/* + # Install a recent CMake RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-linux-x86_64.sh -O /tmp/install-cmake.sh RUN bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license -- 2.7.4