From 856a26f1fa58d7e267bc40ec510b44b2b78ec4d9 Mon Sep 17 00:00:00 2001 From: glutenperfbot Date: Sun, 4 Aug 2024 21:00:37 +0000 Subject: [PATCH 1/4] [VL] Daily Update Velox Version (2024_08_05) Signed-off-by: glutenperfbot --- ep/build-velox/src/get_velox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index c98b8e9ec0da..2477bf4f178c 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -17,7 +17,7 @@ set -exu VELOX_REPO=https://github.com/oap-project/velox.git -VELOX_BRANCH=2024_08_02 +VELOX_BRANCH=2024_08_05 VELOX_HOME="" OS=`uname -s` From c3331e124461fca8e6bd069acf1ae4cc4e6b79b8 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Mon, 5 Aug 2024 14:10:34 +0800 Subject: [PATCH 2/4] Disable arrow build --- dev/ci-velox-buildstatic-centos-7.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/ci-velox-buildstatic-centos-7.sh b/dev/ci-velox-buildstatic-centos-7.sh index 50f8ee06763e..4cbb2b1adf57 100755 --- a/dev/ci-velox-buildstatic-centos-7.sh +++ b/dev/ci-velox-buildstatic-centos-7.sh @@ -10,4 +10,7 @@ cd $GITHUB_WORKSPACE/ source ./dev/vcpkg/env.sh sed -i '/^headers/d' ep/build-velox/build/velox_ep/CMakeLists.txt export NUM_THREADS=4 -./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON +# If a pr contains changes for arrow, e.g, upgrading arrow or applying some new changes to arrow +# source, build_arrow should be set to ON. +./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON \ + --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON --build_arrow=OFF From f924a1dc8e6972318010f853df158a2a0a982adf Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Mon, 5 Aug 2024 16:26:31 +0800 Subject: [PATCH 3/4] Revert "Disable arrow build" This reverts commit c3331e124461fca8e6bd069acf1ae4cc4e6b79b8. --- dev/ci-velox-buildstatic-centos-7.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev/ci-velox-buildstatic-centos-7.sh b/dev/ci-velox-buildstatic-centos-7.sh index 4cbb2b1adf57..50f8ee06763e 100755 --- a/dev/ci-velox-buildstatic-centos-7.sh +++ b/dev/ci-velox-buildstatic-centos-7.sh @@ -10,7 +10,4 @@ cd $GITHUB_WORKSPACE/ source ./dev/vcpkg/env.sh sed -i '/^headers/d' ep/build-velox/build/velox_ep/CMakeLists.txt export NUM_THREADS=4 -# If a pr contains changes for arrow, e.g, upgrading arrow or applying some new changes to arrow -# source, build_arrow should be set to ON. -./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON \ - --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON --build_arrow=OFF +./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF --enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON From bed00e7fcf9231fbfcd1cc50daad300814ac25b5 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Mon, 5 Aug 2024 16:27:22 +0800 Subject: [PATCH 4/4] Update docker --- .github/workflows/velox_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/velox_docker.yml b/.github/workflows/velox_docker.yml index ee6bf9797d41..f3066b7baae2 100644 --- a/.github/workflows/velox_docker.yml +++ b/.github/workflows/velox_docker.yml @@ -51,7 +51,7 @@ concurrency: jobs: build-native-lib-centos-7: runs-on: ubuntu-20.04 - container: apache/gluten:gluten-vcpkg-builder_2024_07_11 # centos7 with dependencies installed + container: apache/gluten:gluten-vcpkg-builder_2024_08_05 # centos7 with dependencies installed steps: - uses: actions/checkout@v2 - name: Generate cache key