From 988be40b3fd5f7d1977ce88202a3cd19370f3ce9 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sun, 15 Jan 2023 21:47:29 +0900 Subject: [PATCH] GH-33667: [C++][CI] Use Ubuntu 22.04 for ASAN (#33669) # 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 Signed-off-by: Sutou Kouhei --- .github/workflows/cpp.yml | 4 +++- cpp/src/arrow/flight/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index b3ade4ca8eaf8..4959197fcd994 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -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 diff --git a/cpp/src/arrow/flight/CMakeLists.txt b/cpp/src/arrow/flight/CMakeLists.txt index 950f7d78a9375..a97047e7d4ed4 100644 --- a/cpp/src/arrow/flight/CMakeLists.txt +++ b/cpp/src/arrow/flight/CMakeLists.txt @@ -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