Fix vcpkg caching

apache · Aug 15, 2024 · 08ebc1b · 08ebc1b
1 parent ec31730
commit 08ebc1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build_bundle_package.yml b/.github/workflows/build_bundle_package.yml
@@ -52,7 +52,6 @@ jobs:
           source /opt/rh/devtoolset-9/enable && \
           source /opt/gluten//dev/vcpkg/env.sh && \
           cd $GITHUB_WORKSPACE/ && \
-          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=OFF \
           --enable_gcs=OFF --enable_hdfs=ON --enable_abfs=OFF

diff --git a/dev/vcpkg/docker/gha-centos-7.dockerfile b/dev/vcpkg/docker/gha-centos-7.dockerfile
@@ -26,5 +26,5 @@ RUN mkdir -p /var/cache/vcpkg
 ENV VCPKG_BINARY_SOURCES=clear;files,/var/cache/vcpkg,readwrite
 
 # Build arrow, then install the native libs to system paths and jar package to .m2/ directory.
-RUN cd /opt/gluten && source ./dev/vcpkg/env.sh && bash ./dev/builddeps-veloxbe.sh build_arrow && \
-    rm -rf ep/_ep/ && rm -rf /tmp/velox-deps/
+RUN cd /opt/gluten && source /opt/rh/devtoolset-9/enable && source ./dev/vcpkg/env.sh && \
+    bash ./dev/builddeps-veloxbe.sh build_arrow && rm -rf /opt/gluten
diff --git a/dev/vcpkg/env.sh b/dev/vcpkg/env.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 
 if [ -z "${BASH_SOURCE[0]}" ] || [ "$0" == "${BASH_SOURCE[0]}" ]; then
     echo "env.sh should only be sourced in bash" >&2