From 8ac2eb848fdc90b3de12dcd4dfd6a3e97ad9b588 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 16 Jun 2025 10:58:34 +0900 Subject: [PATCH 1/2] GH-46820: [CI][Integration] Use Node.js 20 by default --- .env | 2 +- ci/docker/conda-integration.dockerfile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env b/.env index b54b4e5dad7..02a2cf79deb 100644 --- a/.env +++ b/.env @@ -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 diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index 9101446da66..5a5556c23bc 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -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/ From 4e1634107c8d9fd70d4f01fde1fbb2056d1a33a7 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 16 Jun 2025 16:59:38 +0900 Subject: [PATCH 2/2] Remove js from target implementations --- ci/scripts/integration_arrow.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/integration_arrow.sh b/ci/scripts/integration_arrow.sh index b7771bef875..8ef977ad230 100755 --- a/ci/scripts/integration_arrow.sh +++ b/ci/scripts/integration_arrow.sh @@ -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