Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions .github/workflows/cpp_extra.yml

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only new change in this PR

Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,16 @@ jobs:
matrix:
include:
- image: ubuntu-cpp-odbc
title: AMD64 Ubuntu
title: AMD64 Ubuntu Release
build-type: release
# GH-49582: TODO Enable Debian build for ODBC
# - image: debian-cpp-odbc
# title: AMD64 Debian
- image: ubuntu-cpp-odbc
title: AMD64 Ubuntu Debug
build-type: debug
run-options: >-
-e ARROW_BUILD_TYPE=DEBUG
env:
ARCH: amd64
ARCHERY_DEBUG: 1
Expand All @@ -402,8 +408,8 @@ jobs:
uses: actions/cache@v5
with:
path: .docker
key: ${{ matrix.image }}-${{ hashFiles('cpp/**') }}
restore-keys: ${{ matrix.image }}-
key: ${{ matrix.image }}-${{ matrix.build-type }}-${{ hashFiles('cpp/**') }}
restore-keys: ${{ matrix.image }}-${{ matrix.build-type }}-
- name: Setup Python on hosted runner
uses: actions/setup-python@v6
with:
Expand All @@ -418,7 +424,7 @@ jobs:
# GH-40558: reduce ASLR to avoid ASAN/LSAN crashes
sudo sysctl -w vm.mmap_rnd_bits=28
source ci/scripts/util_enable_core_dumps.sh
archery docker run ${{ matrix.image }}
archery docker run ${{ matrix.run-options || '' }} ${{ matrix.image }}
- name: Docker Push
if: >-
success() &&
Expand Down
2 changes: 0 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,6 @@ services:
ARROW_PARQUET: "OFF"
ARROW_S3: "OFF"
ARROW_SUBSTRAIT: "OFF"
# GH-49651 Link ODBC tests statically on Linux to fix segfault
ARROW_TEST_LINKAGE: "static"
# Register ODBC before running tests
networks:
- odbc_net
Expand Down
11 changes: 6 additions & 5 deletions cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@ set(ARROW_FLIGHT_SQL_ODBC_TEST_SRCS
# GH-46889: move protobuf_test_util to a more common location
../../../../engine/substrait/protobuf_test_util.cc)

# GH-49652: TODO support static test linkage on macOS
if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_static
${ARROW_TEST_STATIC_LINK_LIBS})
else()
# GH-49651 Link ODBC tests statically on Linux and dynamically on macOS/Windows
if(WIN32 OR APPLE)
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_shared
${ARROW_TEST_SHARED_LINK_LIBS})
else()
# GH-49651 Link ODBC tests statically on Linux to fix segfault
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_static
${ARROW_TEST_STATIC_LINK_LIBS})
endif()
Comment on lines 44 to 53

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file change and compose.yaml is from the community PR apache#49688.
I am also porting it here because ARROW_TEST_LINKAGE: "static" may take up too much disk space


# On macOS, link `ODBCINST` first to ensure iodbc take precedence over unixodbc
Expand Down
Loading