diff --git a/.docker/Dockerfile.ubuntu b/.docker/Dockerfile.ubuntu index eb1de88d..9d5cf3d1 100644 --- a/.docker/Dockerfile.ubuntu +++ b/.docker/Dockerfile.ubuntu @@ -1,11 +1,11 @@ # syntax=docker/dockerfile:1 ARG ARCH=amd64 -FROM $ARCH/ubuntu:23.10 +FROM $ARCH/ubuntu:24.04 RUN apt update RUN apt upgrade -y RUN apt install -y gnupg wget software-properties-common -RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null -RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main' +# RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null +# RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main' RUN apt install -y \ bash-completion \ vim \ @@ -17,9 +17,12 @@ RUN apt install -y \ g++-12 \ gcc-13 \ g++-13 \ + gcc-14 \ + g++-14 \ clang-15 \ clang-16 \ clang-17 \ + clang-18 \ git \ zstd \ ccache \ diff --git a/.docker/build-linux.sh b/.docker/build-linux.sh index 8bdea531..54280fee 100644 --- a/.docker/build-linux.sh +++ b/.docker/build-linux.sh @@ -15,8 +15,8 @@ rm -rf build mkdir build cd build -GCC_VERSION=13 -CLANG_VERSION=17 +GCC_VERSION=14 +CLANG_VERSION=18 case "-$BUILD_TYPE-" in *-ninja-*) @@ -56,7 +56,7 @@ case "-$BUILD_TYPE-" in export COMPILER=clang ;; *-oldclang-*) - export CC=clang-15 CXX=clang++-15 + export CC=clang-16 CXX=clang++-16 ;; *) echo "missing compiler in: $BUILD_TYPE" diff --git a/.docker/install-static-libs.sh b/.docker/install-static-libs.sh index 56131c52..1187693d 100644 --- a/.docker/install-static-libs.sh +++ b/.docker/install-static-libs.sh @@ -6,8 +6,9 @@ cd "$HOME" mkdir pkgs cd pkgs +# TODO: move to gcc-14 once libunwind compiles with it GCC_VERSION=13 -CLANG_VERSION=17 +CLANG_VERSION=18 FILE_VERSION=5.45 FILE_SHA512=12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a