This is an automated email from the ASF dual-hosted git repository.
raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 8afaf95b38 GH-46569: [CI][Integration] Use apache/arrow-js for JS
(#46570)
8afaf95b38 is described below
commit 8afaf95b38459f97ab12b22ebb7e1913b31025bf
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Fri May 23 17:24:22 2025 +0900
GH-46569: [CI][Integration] Use apache/arrow-js for JS (#46570)
### Rationale for this change
We moved the JS implementation to apache/arrow-js.
### What changes are included in this PR?
Use apache/arrow-js for JS.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
No.
* GitHub Issue: #46569
Authored-by: Sutou Kouhei <k...@clear-code.com>
Signed-off-by: Raúl Cumplido <raulcumpl...@gmail.com>
---
.github/workflows/integration.yml | 22 +++++++++++-----------
ci/scripts/integration_arrow.sh | 2 --
ci/scripts/integration_arrow_build.sh | 6 +++---
dev/archery/archery/cli.py | 3 ++-
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/integration.yml
b/.github/workflows/integration.yml
index 17e275a79a..f2b32e6b07 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -30,11 +30,8 @@ on:
- 'ci/**'
- 'dev/archery/**'
- 'docker-compose.yml'
- - 'go/**'
- 'integration/**'
- - 'js/**'
- 'cpp/**'
- - 'java/**'
- 'csharp/**'
- 'format/**'
pull_request:
@@ -44,12 +41,9 @@ on:
- 'ci/**'
- 'dev/archery/**'
- 'docker-compose.yml'
- - 'go/**'
- 'integration/**'
- - 'js/**'
- 'cpp/**'
- 'csharp/**'
- - 'java/**'
- 'format/**'
concurrency:
@@ -72,30 +66,35 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout Arrow
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #
v4.0.0
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
with:
fetch-depth: 0
submodules: recursive
- name: Checkout Arrow Rust
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #
v4.0.0
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
with:
repository: apache/arrow-rs
path: rust
- name: Checkout Arrow nanoarrow
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #
v4.0.0
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
with:
repository: apache/arrow-nanoarrow
path: nanoarrow
- name: Checkout Arrow Go
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #
v4.1.7
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
with:
repository: apache/arrow-go
path: go
- name: Checkout Arrow Java
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #
v4.1.7
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
with:
repository: apache/arrow-java
path: java
+ - name: Checkout Arrow JS
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
+ with:
+ repository: apache/arrow-js
+ path: js
- name: Free up disk space
run: |
ci/scripts/util_free_space.sh
@@ -121,6 +120,7 @@ jobs:
-e ARCHERY_DEFAULT_BRANCH=${{
github.event.repository.default_branch }} \
-e ARCHERY_INTEGRATION_WITH_GO=1 \
-e ARCHERY_INTEGRATION_WITH_JAVA=1 \
+ -e ARCHERY_INTEGRATION_WITH_JS=1 \
-e ARCHERY_INTEGRATION_WITH_NANOARROW=1 \
-e ARCHERY_INTEGRATION_WITH_RUST=1 \
conda-integration
diff --git a/ci/scripts/integration_arrow.sh b/ci/scripts/integration_arrow.sh
index 275ef431c7..b7771bef87 100755
--- a/ci/scripts/integration_arrow.sh
+++ b/ci/scripts/integration_arrow.sh
@@ -26,7 +26,6 @@ gold_dir=$arrow_dir/testing/data/arrow-ipc-stream/integration
: ${ARROW_INTEGRATION_CPP:=ON}
: ${ARROW_INTEGRATION_CSHARP:=ON}
-: ${ARROW_INTEGRATION_JS:=ON}
: ${ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS:=cpp,csharp,js}
export ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS
@@ -65,7 +64,6 @@ time archery integration \
--run-flight \
--with-cpp=$([ "$ARROW_INTEGRATION_CPP" == "ON" ] && echo "1" || echo "0")
\
--with-csharp=$([ "$ARROW_INTEGRATION_CSHARP" == "ON" ] && echo "1" ||
echo "0") \
- --with-js=$([ "$ARROW_INTEGRATION_JS" == "ON" ] && echo "1" || echo "0") \
--gold-dirs=$gold_dir/0.14.1 \
--gold-dirs=$gold_dir/0.17.1 \
--gold-dirs=$gold_dir/1.0.0-bigendian \
diff --git a/ci/scripts/integration_arrow_build.sh
b/ci/scripts/integration_arrow_build.sh
index 1c7e65cf27..fa7440beae 100755
--- a/ci/scripts/integration_arrow_build.sh
+++ b/ci/scripts/integration_arrow_build.sh
@@ -24,7 +24,6 @@ build_dir=${2}
: ${ARROW_INTEGRATION_CPP:=ON}
: ${ARROW_INTEGRATION_CSHARP:=ON}
-: ${ARROW_INTEGRATION_JS:=ON}
. ${arrow_dir}/ci/scripts/util_log.sh
@@ -65,7 +64,8 @@ fi
github_actions_group_end
github_actions_group_begin "Integration: Build: JavaScript"
-if [ "${ARROW_INTEGRATION_JS}" == "ON" ]; then
- ${arrow_dir}/ci/scripts/js_build.sh ${arrow_dir} ${build_dir}
+if [ "${ARCHERY_INTEGRATION_WITH_JS}" -gt "0" ]; then
+ "${arrow_dir}/js/ci/scripts/build.sh" "${arrow_dir}/js"
+ cp -a "${arrow_dir}/js" "${build_dir}/js"
fi
github_actions_group_end
diff --git a/dev/archery/archery/cli.py b/dev/archery/archery/cli.py
index 171b95eb98..4276e42047 100644
--- a/dev/archery/archery/cli.py
+++ b/dev/archery/archery/cli.py
@@ -735,7 +735,8 @@ def _set_default(opt, default):
help='Include Java in integration tests',
envvar="ARCHERY_INTEGRATION_WITH_JAVA")
@click.option('--with-js', type=bool, default=False,
- help='Include JavaScript in integration tests')
+ help='Include JavaScript in integration tests',
+ envvar="ARCHERY_INTEGRATION_WITH_JS")
@click.option('--with-go', type=bool, default=False,
help='Include Go in integration tests',
envvar="ARCHERY_INTEGRATION_WITH_GO")
