Skip to content
Draft
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
1 change: 1 addition & 0 deletions ci/docker/conda-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ RUN mamba install -q -y \
--file arrow/ci/conda_env_cpp.txt \
--file arrow/ci/conda_env_gandiva.txt \
compilers \
conda-gcc-specs \
doxygen \
libnuma \
mold \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/conda-integration.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ RUN mamba install -q -y \
"python < 3.12" \
numpy \
compilers \
conda-gcc-specs \
go \
maven=${maven} \
nodejs=${node} \
Expand Down
9 changes: 8 additions & 1 deletion dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,12 @@ maybe_setup_virtualenv() {
test_and_install_cpp() {
show_header "Build, install and test C++ libraries"

# Ensure GCC uses libraries and headers from the Conda env
local conda_gcc_specs=()
if [ "$(uname)" = "Linux" ]; then
conda_gcc_specs=(conda-gcc-specs)
fi

# Build and test C++
maybe_setup_virtualenv numpy
maybe_setup_conda \
Expand All @@ -452,7 +458,8 @@ test_and_install_cpp() {
ncurses \
numpy \
sqlite \
compilers
compilers \
"${conda_gcc_specs[@]}"

if [ "${USE_CONDA}" -gt 0 ]; then
DEFAULT_DEPENDENCY_SOURCE="CONDA"
Expand Down
Loading