This is an automated email from the ASF dual-hosted git repository.
rui 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 7c777be25 [VL] Upgrade cmake version to 3.28.3 in CI image (#5842)
7c777be25 is described below
commit 7c777be25fcd549dd53653986c6d40bd6cdcb965
Author: Yuan <[email protected]>
AuthorDate: Thu May 23 08:40:04 2024 +0800
[VL] Upgrade cmake version to 3.28.3 in CI image (#5842)
---
.github/workflows/velox_docker.yml | 2 +-
dev/ci-velox-buildstatic.sh | 2 +-
dev/vcpkg/init.sh | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/velox_docker.yml
b/.github/workflows/velox_docker.yml
index 88c6c2a24..d7644b5d0 100644
--- a/.github/workflows/velox_docker.yml
+++ b/.github/workflows/velox_docker.yml
@@ -49,7 +49,7 @@ concurrency:
jobs:
build-native-lib-centos-7:
runs-on: ubuntu-20.04
- container: apache/gluten:gluten-vcpkg-builder_2024_03_17 # centos7 with
dependencies installed
+ container: apache/gluten:gluten-vcpkg-builder_2024_05_22 # centos7 with
dependencies installed
steps:
- uses: actions/checkout@v2
- name: Generate cache key
diff --git a/dev/ci-velox-buildstatic.sh b/dev/ci-velox-buildstatic.sh
index a9b9d2c3f..208490d1c 100755
--- a/dev/ci-velox-buildstatic.sh
+++ b/dev/ci-velox-buildstatic.sh
@@ -2,7 +2,7 @@ yum install sudo patch java-1.8.0-openjdk-devel -y
cd $GITHUB_WORKSPACE/ep/build-velox/src
./get_velox.sh
source /opt/rh/devtoolset-9/enable
-source $GITHUB_WORKSPACE//dev/vcpkg/env.sh
+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
diff --git a/dev/vcpkg/init.sh b/dev/vcpkg/init.sh
index 141543af4..e69aec94a 100755
--- a/dev/vcpkg/init.sh
+++ b/dev/vcpkg/init.sh
@@ -16,6 +16,9 @@ if [ ! -d "$VCPKG_ROOT" ] || [ -z "$(ls "$VCPKG_ROOT")" ];
then
fi
[ -f "$VCPKG" ] || "$VCPKG_ROOT/bootstrap-vcpkg.sh" -disableMetrics
+sed -i "s/3.27.1/3.28.3/g" $VCPKG_ROOT/scripts/vcpkgTools.xml
+sed -i
"s/192374a68e2971f04974a194645726196d9b8ee7abd650d1e6f65f7aa2ccc9b186c3edb473bb4958c764532edcdd42f4182ee1fcb86b17d78b0bcd6305ce3df1/bd311ca835ef0914952f21d70d1753564d58de2ede02e80ede96e78cd2f40b4189e006007643ebb37792e13edd97eb4a33810bc8aca1eab6dd428eaffe1d2e38/g"
$VCPKG_ROOT/scripts/vcpkgTools.xml
+
$VCPKG install --no-print-usage \
--triplet="${VCPKG_TRIPLET}" --host-triplet="${VCPKG_TRIPLET}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
