This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new effd5af9c7 GH-41147: [CI][C++] Use newer LLVM on Ubuntu 24.04 (#41150)
effd5af9c7 is described below
commit effd5af9c764c9e7509f106c0814e34bec9b4022
Author: Antoine Pitrou <[email protected]>
AuthorDate: Thu Apr 11 16:01:38 2024 +0200
GH-41147: [CI][C++] Use newer LLVM on Ubuntu 24.04 (#41150)
### What changes are included in this PR?
Use LLVM 15 on Ubuntu 24.04, as LLVM 14 packages seem not always available.
### Are these changes tested?
Yes, on CI.
### Are there any user-facing changes?
No.
* GitHub Issue: #41147
Authored-by: Antoine Pitrou <[email protected]>
Signed-off-by: Antoine Pitrou <[email protected]>
---
ci/docker/ubuntu-24.04-cpp.dockerfile | 4 ++--
dev/tasks/tasks.yml | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile
b/ci/docker/ubuntu-24.04-cpp.dockerfile
index 629d532a3d..4a37818f94 100644
--- 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
index f98c0a2b48..e05d6870cf 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -1056,7 +1056,7 @@ tasks:
params:
image: conda-cpp-valgrind
-{% for ubuntu_version in ["20.04", "22.04", "24.04"] %}
+{% for ubuntu_version in ["20.04", "22.04"] %}
test-ubuntu-{{ ubuntu_version }}-cpp:
ci: github
template: docker-tests/github.linux.yml
@@ -1074,13 +1074,25 @@ tasks:
UBUNTU: 20.04
image: ubuntu-cpp-bundled
+ test-ubuntu-24.04-cpp:
+ ci: github
+ template: docker-tests/github.linux.yml
+ params:
+ env:
+ CLANG_TOOLS: 15
+ LLVM: 15
+ UBUNTU: 24.04
+ image: ubuntu-cpp
+
test-ubuntu-24.04-cpp-gcc-14:
ci: github
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
