Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-41147: [CI][C++] Use newer LLVM on Ubuntu 24.04 #41150

Merged
merged 1 commit into from
Apr 11, 2024
Merged

GH-41147: [CI][C++] Use newer LLVM on Ubuntu 24.04 #41150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/docker/ubuntu-24.04-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down Expand Up @@ -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; \
Expand Down
16 changes: 14 additions & 2 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading