diff --git a/.gitlab/ci/docker/debian12-aarch64/Dockerfile b/.gitlab/ci/docker/debian13-aarch64/Dockerfile similarity index 97% rename from .gitlab/ci/docker/debian12-aarch64/Dockerfile rename to .gitlab/ci/docker/debian13-aarch64/Dockerfile index 2344ce53a9..4793a96ef0 100644 --- a/.gitlab/ci/docker/debian12-aarch64/Dockerfile +++ b/.gitlab/ci/docker/debian13-aarch64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=arm64v8/debian:12 +ARG BASE_IMAGE=arm64v8/debian:13 FROM ${BASE_IMAGE} AS cuda-keyring ADD https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/sbsa/cuda-keyring_1.1-1_all.deb /root/ diff --git a/.gitlab/ci/docker/debian12-aarch64/deps_packages.lst b/.gitlab/ci/docker/debian13-aarch64/deps_packages.lst similarity index 96% rename from .gitlab/ci/docker/debian12-aarch64/deps_packages.lst rename to .gitlab/ci/docker/debian13-aarch64/deps_packages.lst index 2328194a88..0b7662248c 100644 --- a/.gitlab/ci/docker/debian12-aarch64/deps_packages.lst +++ b/.gitlab/ci/docker/debian13-aarch64/deps_packages.lst @@ -20,7 +20,7 @@ libzstd-dev zlib1g-dev # Install iwyu runtime deps. -clang-15 +clang-19 libncurses6 # Tools needed for the test suite. @@ -79,7 +79,7 @@ libopenal-dev libopenmpi-dev openmpi-bin libosp-dev libpng-dev -libpq-dev postgresql-server-dev-15 +libpq-dev postgresql-server-dev-17 libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc libsdl1.2-dev libsqlite3-dev @@ -91,7 +91,7 @@ libxalan-c-dev libxerces-c-dev libxml2-dev libxml2-utils libxslt-dev xsltproc -openjdk-17-jdk +openjdk-25-jdk python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv qtbase5-dev qtbase5-dev-tools ruby ruby-dev diff --git a/.gitlab/ci/docker/debian12-aarch64/docker-clean b/.gitlab/ci/docker/debian13-aarch64/docker-clean similarity index 100% rename from .gitlab/ci/docker/debian12-aarch64/docker-clean rename to .gitlab/ci/docker/debian13-aarch64/docker-clean diff --git a/.gitlab/ci/docker/debian12-aarch64/dpkg-exclude b/.gitlab/ci/docker/debian13-aarch64/dpkg-exclude similarity index 100% rename from .gitlab/ci/docker/debian12-aarch64/dpkg-exclude rename to .gitlab/ci/docker/debian13-aarch64/dpkg-exclude diff --git a/.gitlab/ci/docker/debian12-aarch64/install_deps.sh b/.gitlab/ci/docker/debian13-aarch64/install_deps.sh similarity index 100% rename from .gitlab/ci/docker/debian12-aarch64/install_deps.sh rename to .gitlab/ci/docker/debian13-aarch64/install_deps.sh diff --git a/.gitlab/ci/docker/debian12-x86_64/Dockerfile b/.gitlab/ci/docker/debian13-x86_64/Dockerfile similarity index 96% rename from .gitlab/ci/docker/debian12-x86_64/Dockerfile rename to .gitlab/ci/docker/debian13-x86_64/Dockerfile index 3a9a6a14ab..3c40e520e5 100644 --- a/.gitlab/ci/docker/debian12-x86_64/Dockerfile +++ b/.gitlab/ci/docker/debian13-x86_64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=debian:12 +ARG BASE_IMAGE=debian:13 FROM ${BASE_IMAGE} AS apt-cache # Populate APT cache w/ the fresh metadata and prefetch packages. @@ -58,7 +58,7 @@ RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \ RUN --mount=type=bind,from=iwyu-build,source=/root,target=/root \ tar -C / -xf /root/iwyu.tar \ - && ln -s /usr/lib/llvm-15/bin/include-what-you-use /usr/bin/include-what-you-use-15 + && ln -s /usr/lib/llvm-19/bin/include-what-you-use /usr/bin/include-what-you-use-19 RUN --mount=type=bind,from=rvm-build,source=/root,target=/root \ tar -C /usr/local -xf /root/rvm.tar diff --git a/.gitlab/ci/docker/debian12-x86_64/deps_packages.lst b/.gitlab/ci/docker/debian13-x86_64/deps_packages.lst similarity index 94% rename from .gitlab/ci/docker/debian12-x86_64/deps_packages.lst rename to .gitlab/ci/docker/debian13-x86_64/deps_packages.lst index e6f1188537..b1b792c1a2 100644 --- a/.gitlab/ci/docker/debian12-x86_64/deps_packages.lst +++ b/.gitlab/ci/docker/debian13-x86_64/deps_packages.lst @@ -20,7 +20,7 @@ libzstd-dev zlib1g-dev # Install iwyu runtime deps. -clang-15 +clang-19 libncurses6 # Tools needed for the test suite. @@ -38,9 +38,6 @@ nasm # Install HIP language toolchain. hipcc -# Install swift runtime deps. -libncurses5 - # Install IAR compiler package dependencies. libusb-1.0-0 udev @@ -90,7 +87,7 @@ libopenal-dev libopenmpi-dev openmpi-bin libosp-dev libpng-dev -libpq-dev postgresql-server-dev-15 +libpq-dev postgresql-server-dev-17 libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc libsdl1.2-dev libsqlite3-dev @@ -102,7 +99,7 @@ libxalan-c-dev libxerces-c-dev libxml2-dev libxml2-utils libxslt-dev xsltproc -openjdk-17-jdk +openjdk-25-jdk python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv qtbase5-dev qtbase5-dev-tools rbenv ruby-build diff --git a/.gitlab/ci/docker/debian12-x86_64/docker-clean b/.gitlab/ci/docker/debian13-x86_64/docker-clean similarity index 100% rename from .gitlab/ci/docker/debian12-x86_64/docker-clean rename to .gitlab/ci/docker/debian13-x86_64/docker-clean diff --git a/.gitlab/ci/docker/debian12-x86_64/dpkg-exclude b/.gitlab/ci/docker/debian13-x86_64/dpkg-exclude similarity index 100% rename from .gitlab/ci/docker/debian12-x86_64/dpkg-exclude rename to .gitlab/ci/docker/debian13-x86_64/dpkg-exclude diff --git a/.gitlab/ci/docker/debian12-x86_64/install_deps.sh b/.gitlab/ci/docker/debian13-x86_64/install_deps.sh similarity index 100% rename from .gitlab/ci/docker/debian12-x86_64/install_deps.sh rename to .gitlab/ci/docker/debian13-x86_64/install_deps.sh diff --git a/.gitlab/ci/docker/debian12-x86_64/install_iwyu.sh b/.gitlab/ci/docker/debian13-x86_64/install_iwyu.sh similarity index 88% rename from .gitlab/ci/docker/debian12-x86_64/install_iwyu.sh rename to .gitlab/ci/docker/debian13-x86_64/install_iwyu.sh index bbeceb8f13..6247d8a945 100755 --- a/.gitlab/ci/docker/debian12-x86_64/install_iwyu.sh +++ b/.gitlab/ci/docker/debian13-x86_64/install_iwyu.sh @@ -8,7 +8,7 @@ apt-get install -y $(grep '^[^#]\+$' /root/iwyu_packages.lst) cd /root git clone "https://github.com/include-what-you-use/include-what-you-use.git" cd include-what-you-use -readonly llvm_version="$( clang-15 --version | head -n1 | cut -d' ' -f4 | cut -d. -f-1 )" +readonly llvm_version="$( clang-19 --version | head -n1 | cut -d' ' -f4 | cut -d. -f-1 )" git checkout "clang_$llvm_version" mkdir build cd build diff --git a/.gitlab/ci/docker/debian12-x86_64/install_rvm.sh b/.gitlab/ci/docker/debian13-x86_64/install_rvm.sh similarity index 100% rename from .gitlab/ci/docker/debian12-x86_64/install_rvm.sh rename to .gitlab/ci/docker/debian13-x86_64/install_rvm.sh diff --git a/.gitlab/ci/docker/debian12-x86_64/iwyu_packages.lst b/.gitlab/ci/docker/debian13-x86_64/iwyu_packages.lst similarity index 63% rename from .gitlab/ci/docker/debian12-x86_64/iwyu_packages.lst rename to .gitlab/ci/docker/debian13-x86_64/iwyu_packages.lst index 2dbddba9f8..7301924dfa 100644 --- a/.gitlab/ci/docker/debian12-x86_64/iwyu_packages.lst +++ b/.gitlab/ci/docker/debian13-x86_64/iwyu_packages.lst @@ -1,7 +1,7 @@ # Install development tools. -clang-15 -libclang-15-dev -llvm-15-dev +clang-19 +libclang-19-dev +llvm-19-dev libz-dev g++ cmake diff --git a/.gitlab/ci/docker/debian12-x86_64/rvm_packages.lst b/.gitlab/ci/docker/debian13-x86_64/rvm_packages.lst similarity index 92% rename from .gitlab/ci/docker/debian12-x86_64/rvm_packages.lst rename to .gitlab/ci/docker/debian13-x86_64/rvm_packages.lst index 80f079cbf2..6ea8a8f514 100644 --- a/.gitlab/ci/docker/debian12-x86_64/rvm_packages.lst +++ b/.gitlab/ci/docker/debian13-x86_64/rvm_packages.lst @@ -11,7 +11,7 @@ libc6-dev libffi-dev libgdbm-dev libgmp-dev -libncurses5-dev +libncurses-dev libreadline-dev libsqlite3-dev libssl-dev