Skip to content

Commit

Permalink
GH-33667: [C++][CI] Use Ubuntu 22.04 for ASAN (#33669)
Browse files Browse the repository at this point in the history
# Which issue does this PR close?

Closes #33667

# Rationale for this change

There is a problem in deb packages provided by
LLVM. `sanitizer/asan_interface.h` is included in `libclang-rt-14-dev` but it's conflicted with `libclang-common-14-dev`. And `clang-14` requires `libclang-common-14-dev`. It means that we can't install both of `clang-14` and `libclang-rt-14-dev` at once.

We use deb packages provided by LLVM on Ubuntu 20.04 because Ubuntu 20.4 provides only old LLVM. But we can use deb packages provided by Ubuntu on Ubuntu 22.04.

# What changes are included in this PR?

We use deb packages provided by Ubuntu to avoid this problem.

# Are these changes tested?

Yes.

# Are there any user-facing changes?

No.
* Closes: #33667

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
  • Loading branch information
kou authored Jan 15, 2023
1 parent b743ee9 commit 988be40
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ jobs:
- image: conda-cpp
title: AMD64 Conda C++
- image: ubuntu-cpp-sanitizer
title: AMD64 Ubuntu 20.04 C++ ASAN UBSAN
title: AMD64 Ubuntu 22.04 C++ ASAN UBSAN
env:
UBUNTU: "22.04"
steps:
- name: Checkout Arrow
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/flight/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ if(ARROW_TESTING)
set(ARROW_FLIGHT_TESTING_STATIC_INSTALL_INTERFACE_LIBS
ArrowFlight::arrow_flight_static)
endif()
if(ARROW_TEST_LINKAGE STREQUAL "shared")
if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "shared")
list(APPEND ARROW_FLIGHT_TESTING_SHARED_LINK_LIBS arrow_testing_shared)
list(APPEND ARROW_FLIGHT_TESTING_STATIC_LINK_LIBS arrow_testing_shared)
list(APPEND ARROW_FLIGHT_TESTING_SHARED_INSTALL_INTERFACE_LIBS
Expand Down

0 comments on commit 988be40

Please sign in to comment.