Skip to content

Commit

Permalink
apacheGH-43874: [CI][Integration][Go] Use apache/arrow-go
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Sep 17, 2024
1 parent fea1e97 commit 6049dfd
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ jobs:
with:
repository: apache/arrow-nanoarrow
path: nanoarrow
- name: Checkout Arrow Go
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with:
repository: apache/arrow-go
path: go
- name: Free up disk space
run: |
ci/scripts/util_free_space.sh
Expand All @@ -104,6 +109,7 @@ jobs:
source ci/scripts/util_enable_core_dumps.sh
archery docker run \
-e ARCHERY_DEFAULT_BRANCH=${{ github.event.repository.default_branch }} \
-e ARCHERY_INTEGRATION_WITH_GO=1 \
-e ARCHERY_INTEGRATION_WITH_NANOARROW=1 \
-e ARCHERY_INTEGRATION_WITH_RUST=1 \
conda-integration
Expand Down
4 changes: 1 addition & 3 deletions ci/scripts/integration_arrow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@ gold_dir=$arrow_dir/testing/data/arrow-ipc-stream/integration

: ${ARROW_INTEGRATION_CPP:=ON}
: ${ARROW_INTEGRATION_CSHARP:=ON}
: ${ARROW_INTEGRATION_GO:=ON}
: ${ARROW_INTEGRATION_JAVA:=ON}
: ${ARROW_INTEGRATION_JS:=ON}

: ${ARCHERY_INTEGRATION_TARGET_LANGUAGES:=cpp,csharp,go,java,js}
: ${ARCHERY_INTEGRATION_TARGET_LANGUAGES:=cpp,csharp,java,js}
export ARCHERY_INTEGRATION_TARGET_LANGUAGES

. ${arrow_dir}/ci/scripts/util_log.sh
Expand Down Expand Up @@ -67,7 +66,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-go=$([ "$ARROW_INTEGRATION_GO" == "ON" ] && echo "1" || echo "0") \
--with-java=$([ "$ARROW_INTEGRATION_JAVA" == "ON" ] && echo "1" || echo "0") \
--with-js=$([ "$ARROW_INTEGRATION_JS" == "ON" ] && echo "1" || echo "0") \
--gold-dirs=$gold_dir/0.14.1 \
Expand Down
13 changes: 6 additions & 7 deletions ci/scripts/integration_arrow_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ build_dir=${2}

: ${ARROW_INTEGRATION_CPP:=ON}
: ${ARROW_INTEGRATION_CSHARP:=ON}
: ${ARROW_INTEGRATION_GO:=ON}
: ${ARROW_INTEGRATION_JAVA:=ON}
: ${ARROW_INTEGRATION_JS:=ON}

Expand All @@ -38,6 +37,12 @@ github_actions_group_begin "Integration: Build: nanoarrow"
${arrow_dir}/ci/scripts/nanoarrow_build.sh ${arrow_dir} ${build_dir}
github_actions_group_end

github_actions_group_begin "Integration: Build: Go"
if [ "${ARCHERY_INTEGRATION_WITH_GO}" -gt "0" ]; then
${arrow_dir}/go/ci/scripts/build.sh ${arrow_dir} ${build_dir}
fi
github_actions_group_end

github_actions_group_begin "Integration: Build: C++"
if [ "${ARROW_INTEGRATION_CPP}" == "ON" ]; then
${arrow_dir}/ci/scripts/cpp_build.sh ${arrow_dir} ${build_dir}
Expand All @@ -50,12 +55,6 @@ if [ "${ARROW_INTEGRATION_CSHARP}" == "ON" ]; then
fi
github_actions_group_end

github_actions_group_begin "Integration: Build: Go"
if [ "${ARROW_INTEGRATION_GO}" == "ON" ]; then
${arrow_dir}/ci/scripts/go_build.sh ${arrow_dir} ${build_dir}
fi
github_actions_group_end

github_actions_group_begin "Integration: Build: Java"
if [ "${ARROW_INTEGRATION_JAVA}" == "ON" ]; then
export ARROW_JAVA_CDATA="ON"
Expand Down
3 changes: 2 additions & 1 deletion dev/archery/archery/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,8 @@ def _set_default(opt, default):
@click.option('--with-js', type=bool, default=False,
help='Include JavaScript in integration tests')
@click.option('--with-go', type=bool, default=False,
help='Include Go in integration tests')
help='Include Go in integration tests',
envvar="ARCHERY_INTEGRATION_WITH_GO")
@click.option('--with-nanoarrow', type=bool, default=False,
help='Include nanoarrow in integration tests',
envvar="ARCHERY_INTEGRATION_WITH_NANOARROW")
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1870,6 +1870,7 @@ services:
volumes: *conda-volumes
environment:
<<: [*common, *ccache]
ARCHERY_INTEGRATION_WITH_GO: 0
ARCHERY_INTEGRATION_WITH_NANOARROW: 0
ARCHERY_INTEGRATION_WITH_RUST: 0
# Tell Archery where Arrow binaries are located
Expand Down

0 comments on commit 6049dfd

Please sign in to comment.