apacheGH-41147: [CI][C++] Use newer LLVM on Ubuntu 24.04

pitrou · Apr 11, 2024 · 9106472 · 9106472
1 parent b3b4521
commit 9106472
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile
@@ -29,7 +29,7 @@ RUN echo "debconf debconf/frontend select Noninteractive" | \
 # while debugging package list with docker build.
 ARG clang_tools
 ARG llvm
-RUN latest_system_llvm=14 && \
+RUN latest_system_llvm=18 && \
     if [ ${llvm} -gt ${latest_system_llvm} -o \
          ${clang_tools} -gt ${latest_system_llvm} ]; then \
       apt-get update -y -q && \
@@ -127,7 +127,7 @@ RUN if [ "${gcc_version}" = "" ]; then \
           g++ \
           gcc; \
     else \
-      if [ "${gcc_version}" -gt "12" ]; then \
+      if [ "${gcc_version}" -gt "14" ]; then \
           apt-get update -y -q && \
           apt-get install -y -q --no-install-recommends software-properties-common && \
           add-apt-repository ppa:ubuntu-toolchain-r/volatile; \

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -1079,8 +1079,10 @@ tasks:
     template: docker-tests/github.linux.yml
     params:
       env:
-        UBUNTU: "24.04"
+        CLANG_TOOLS: 15
         GCC_VERSION: 14
+        LLVM: 15
+        UBUNTU: 24.04
       # rapidjson 1.1.0 has an error caught by gcc 14.
       # https://github.com/Tencent/rapidjson/issues/718
       flags: -e CC=gcc-14 -e CXX=g++-14 -e RapidJSON_SOURCE=BUNDLED