diff --git a/ci/scripts/integration_arrow.sh b/ci/scripts/integration_arrow.sh index e417dd5380fe1..a471348d602bc 100755 --- a/ci/scripts/integration_arrow.sh +++ b/ci/scripts/integration_arrow.sh @@ -30,14 +30,13 @@ gold_dir=$arrow_dir/testing/data/arrow-ipc-stream/integration : ${ARROW_INTEGRATION_JAVA:=ON} : ${ARROW_INTEGRATION_JS:=ON} -echo "::group::Integration: Prepare: Archery" -set -x +. ${arrow_dir}/ci/scripts/util_log.sh + +github_actions_group_begin "Integration: Prepare: Archery" pip install -e $arrow_dir/dev/archery[integration] -set +x -echo "::endgroup::" +github_actions_group_ehd -echo "::group::Integration: Prepare: Dependencies" -set -x +github_actions_group_begin "Integration: Prepare: Dependencies" # For C Data Interface testing if [ "${ARROW_INTEGRATION_CSHARP}" == "ON" ]; then pip install pythonnet @@ -45,8 +44,7 @@ fi if [ "${ARROW_INTEGRATION_JAVA}" == "ON" ]; then pip install jpype1 fi -set +x -echo "::endgroup::" +github_actions_group_ehd export ARROW_BUILD_ROOT=${build_dir} diff --git a/ci/scripts/integration_arrow_build.sh b/ci/scripts/integration_arrow_build.sh index f7c6749217365..8fca0d434b75e 100755 --- a/ci/scripts/integration_arrow_build.sh +++ b/ci/scripts/integration_arrow_build.sh @@ -28,44 +28,35 @@ build_dir=${2} : ${ARROW_INTEGRATION_JAVA:=ON} : ${ARROW_INTEGRATION_JS:=ON} -echo "::group::Integration: Build: Rust" -set -x +. ${arrow_dir}/ci/scripts/util_log.sh + +github_actions_group_begin "Integration: Build: Rust" ${arrow_dir}/ci/scripts/rust_build.sh ${arrow_dir} ${build_dir} -set +x -echo "::endgroup::" +github_actions_group_end -echo "::group::Integration: Build: nanoarrow" -set -x +github_actions_group_begin "Integration: Build: nanoarrow" ${arrow_dir}/ci/scripts/nanoarrow_build.sh ${arrow_dir} ${build_dir} -set +x -echo "::endgroup::" +github_actions_group_end -echo "::group::Integration: Build: C++" -set -x +github_actions_group_begin "Integration: Build: C++" if [ "${ARROW_INTEGRATION_CPP}" == "ON" ]; then ${arrow_dir}/ci/scripts/cpp_build.sh ${arrow_dir} ${build_dir} fi -set +x -echo "::endgroup::" +github_actions_group_end -echo "::group::Integration: Build: C#" -set -x +github_actions_group_begin "Integration: Build: C#" if [ "${ARROW_INTEGRATION_CSHARP}" == "ON" ]; then ${arrow_dir}/ci/scripts/csharp_build.sh ${arrow_dir} ${build_dir} fi -set +x -echo "::endgroup::" +github_actions_group_end -echo "::group::Integration: Build: Go" -set -x +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 -set +x -echo "::endgroup::" +github_actions_group_end -echo "::group::Integration: Build: Java" -set -x +github_actions_group_begin "Integration: Build: Java" if [ "${ARROW_INTEGRATION_JAVA}" == "ON" ]; then export ARROW_JAVA_CDATA="ON" export JAVA_JNI_CMAKE_ARGS="-DARROW_JAVA_JNI_ENABLE_DEFAULT=OFF -DARROW_JAVA_JNI_ENABLE_C=ON" @@ -73,13 +64,10 @@ if [ "${ARROW_INTEGRATION_JAVA}" == "ON" ]; then ${arrow_dir}/ci/scripts/java_jni_build.sh ${arrow_dir} ${ARROW_HOME} ${build_dir} /tmp/dist/java ${arrow_dir}/ci/scripts/java_build.sh ${arrow_dir} ${build_dir} /tmp/dist/java fi -set +x -echo "::endgroup::" +github_actions_group_end -echo "::group::Integration: Build: JavaScript" -set -x +github_actions_group_begin "Integration: Build: JavaScript" if [ "${ARROW_INTEGRATION_JS}" == "ON" ]; then ${arrow_dir}/ci/scripts/js_build.sh ${arrow_dir} ${build_dir} fi -set +x -echo "::endgroup::" +github_actions_group_end diff --git a/ci/scripts/util_log.sh b/ci/scripts/util_log.sh new file mode 100644 index 0000000000000..b34c44059adb2 --- /dev/null +++ b/ci/scripts/util_log.sh @@ -0,0 +1,26 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +github_actions_group_begin() { + echo "::group::$1" + set -x +} + +github_actions_group_end() { + set +x + echo "::endgroup::" +}