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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ KARTOTHEK=latest
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
LLVM=18
MAVEN=3.8.7
NODE=18
NODE=20
NUMBA=latest
NUMPY=latest
PANDAS=latest
Expand Down
4 changes: 3 additions & 1 deletion ci/docker/conda-integration.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ ARG arch=amd64
FROM ${repo}:${arch}-conda-cpp

ARG arch=amd64
# We need to synchronize the following values with the values in .env
# and services.conda-integration in docker-compose.yml.
ARG maven=3.8.7
ARG node=20
ARG yarn=1.22
ARG jdk=11
ARG jdk=17

# Install Archery and integration dependencies
COPY ci/conda_env_archery.txt /arrow/ci/
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/integration_arrow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gold_dir=$arrow_dir/testing/data/arrow-ipc-stream/integration
: ${ARROW_INTEGRATION_CPP:=ON}
: ${ARROW_INTEGRATION_CSHARP:=ON}

: ${ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS:=cpp,csharp,js}
: ${ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS:=cpp,csharp}
export ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS

. ${arrow_dir}/ci/scripts/util_log.sh
Expand Down
Loading