This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 44a263f6a2 [GLUTEN-10964][VL] Fix CI docker image build (#10953)
44a263f6a2 is described below
commit 44a263f6a2c037ba568109e02c7badd8cf747926
Author: Yuan <[email protected]>
AuthorDate: Thu Oct 30 21:30:20 2025 +0000
[GLUTEN-10964][VL] Fix CI docker image build (#10953)
This patch fixes the CI image build failures
fix ninja build dir
fix build_arrow dependencies install
---------
Signed-off-by: Yuan <[email protected]>
---
dev/builddeps-veloxbe.sh | 9 ++++++++-
ep/build-velox/src/get-velox.sh | 1 +
ep/build-velox/src/setup-centos7.sh | 3 ++-
ep/build-velox/src/setup-centos8.sh | 2 +-
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dev/builddeps-veloxbe.sh b/dev/builddeps-veloxbe.sh
index 32acdb260f..7f0c3ee6b4 100755
--- a/dev/builddeps-veloxbe.sh
+++ b/dev/builddeps-veloxbe.sh
@@ -207,7 +207,7 @@ concat_velox_param
function build_arrow {
if [ ! -d "$VELOX_HOME" ]; then
- get_velox && setup_dependencies
+ get_velox && setup_dependencies_arrow
fi
cd $GLUTEN_DIR/dev
source ./build-arrow.sh
@@ -296,6 +296,13 @@ function setup_dependencies {
popd
}
+function setup_dependencies_arrow {
+ DEPENDENCY_DIR=${DEPENDENCY_DIR:-$CURRENT_DIR/../ep/_ep}
+ mkdir -p ${DEPENDENCY_DIR}
+
+ source ${VELOX_HOME}/scripts/setup-common.sh
+}
+
OS=`uname -s`
ARCH=`uname -m`
commands_to_run=(${OTHER_ARGUMENTS[@]:-})
diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh
index 10a0103f9f..ad18a2d2d8 100755
--- a/ep/build-velox/src/get-velox.sh
+++ b/ep/build-velox/src/get-velox.sh
@@ -72,6 +72,7 @@ function process_setup_ubuntu {
}
function process_setup_centos9 {
+ sed -i "s|-DFOLLY_HAVE_INT128_T=ON|-DFOLLY_HAVE_INT128_T=ON
-DFOLLY_NO_EXCEPTION_TRACER=ON|g" scripts/setup-common.sh
echo "Using setup script from Velox"
}
diff --git a/ep/build-velox/src/setup-centos7.sh
b/ep/build-velox/src/setup-centos7.sh
index 6acf8ac727..753b1d926b 100755
--- a/ep/build-velox/src/setup-centos7.sh
+++ b/ep/build-velox/src/setup-centos7.sh
@@ -61,6 +61,7 @@ function install_cmake {
function install_ninja {
cd "${DEPENDENCY_DIR}"
github_checkout ninja-build/ninja v1.11.1 --depth 1
+ cd ninja
./configure.py --bootstrap
cmake -Bbuild-cmake
cmake --build build-cmake
@@ -70,7 +71,7 @@ function install_ninja {
function install_folly {
cd "${DEPENDENCY_DIR}"
wget_and_untar
https://github.com/facebook/folly/archive/refs/tags/${FB_OS_VERSION}.tar.gz
folly
- cmake_install folly -DBUILD_TESTS=OFF -DFOLLY_HAVE_INT128_T=ON
+ cmake_install folly -DBUILD_TESTS=OFF -DFOLLY_HAVE_INT128_T=ON
-DFOLLY_NO_EXCEPTION_TRACER=ON
}
function install_conda {
diff --git a/ep/build-velox/src/setup-centos8.sh
b/ep/build-velox/src/setup-centos8.sh
index c002b4d266..e056ce71dd 100755
--- a/ep/build-velox/src/setup-centos8.sh
+++ b/ep/build-velox/src/setup-centos8.sh
@@ -138,7 +138,7 @@ function install_fizz {
function install_folly {
wget_and_untar
https://github.com/facebook/folly/archive/refs/tags/${FB_OS_VERSION}.tar.gz
folly
- cmake_install_dir folly -DFOLLY_HAVE_INT128_T=ON
+ cmake_install_dir folly -DFOLLY_HAVE_INT128_T=ON
-DFOLLY_NO_EXCEPTION_TRACER=ON
}
function install_wangle {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
