diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -28,7 +28,7 @@ # $ docker push ldionne/libcxx-builder # -FROM ubuntu:focal +FROM ubuntu:jammy # Make sure apt-get doesn't try to prompt for stuff like our time zone, etc. ENV DEBIAN_FRONTEND=noninteractive @@ -56,10 +56,12 @@ # Install Clang , and ToT, which are the ones we support. # We also install to allow smooth CI transitions around release points. +# TODO enable LVM_LATEST_VERSION - 2 after changing to version 15 +# Normally this is enabled but LLVM 12 isn't backported to Jammy. ENV LLVM_LATEST_VERSION=14 RUN apt-get update && apt-get install -y lsb-release wget software-properties-common RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh -RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION - 2)) # for CI transitions +#RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION - 2)) # for CI transitions RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION - 1)) # previous release RUN bash /tmp/llvm.sh $LLVM_LATEST_VERSION # latest release RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION + 1)) # current ToT @@ -79,10 +81,10 @@ RUN apt-get install -y clang-tidy-$LLVM_LATEST_VERSION RUN ln -s /usr/bin/clang-tidy-$LLVM_LATEST_VERSION /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ] -# Install the most recent GCC -ENV GCC_LATEST_VERSION=11 -RUN add-apt-repository ppa:ubuntu-toolchain-r/test +# 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 g++-$GCC_LATEST_VERSION +RUN apt-get update && apt install -y gcc-$((GCC_LATEST_VERSION - 1)) g++-$((GCC_LATEST_VERSION - 1)) # 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