From 4df0c5e5d88aafb08ce60f3ecba50ba963238de6 Mon Sep 17 00:00:00 2001 From: wforget <643348094@qq.com> Date: Tue, 27 Aug 2024 20:56:44 +0800 Subject: [PATCH 1/3] [GLUTEN-7035][VL] Get head for target_build_commit --- 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 cdcbf50e5c38..003a3790cedf 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -151,7 +151,7 @@ fi VELOX_SOURCE_DIR="${VELOX_HOME}" # checkout code -TARGET_BUILD_COMMIT="$(git ls-remote $VELOX_REPO $VELOX_BRANCH | awk '{print $1;}')" +TARGET_BUILD_COMMIT="$(git ls-remote $VELOX_REPO $VELOX_BRANCH | awk '{print $1;}' | head -n 1)" if [ -d $VELOX_SOURCE_DIR ]; then echo "Velox source folder $VELOX_SOURCE_DIR already exists..." cd $VELOX_SOURCE_DIR From e891effcb4c6b61028efd0c45a8ac2ff5b1bbcba Mon Sep 17 00:00:00 2001 From: wforget <643348094@qq.com> Date: Tue, 27 Aug 2024 21:24:25 +0800 Subject: [PATCH 2/3] address comment --- 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 003a3790cedf..925245b26539 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -151,7 +151,7 @@ fi VELOX_SOURCE_DIR="${VELOX_HOME}" # checkout code -TARGET_BUILD_COMMIT="$(git ls-remote $VELOX_REPO $VELOX_BRANCH | awk '{print $1;}' | head -n 1)" +TARGET_BUILD_COMMIT="$(git ls-remote $VELOX_REPO refs/heads/$VELOX_BRANCH | awk '{print $1;}')" if [ -d $VELOX_SOURCE_DIR ]; then echo "Velox source folder $VELOX_SOURCE_DIR already exists..." cd $VELOX_SOURCE_DIR From 69717cd5200e852dacc660d299aced04b94548e7 Mon Sep 17 00:00:00 2001 From: wforget <643348094@qq.com> Date: Tue, 27 Aug 2024 21:29:20 +0800 Subject: [PATCH 3/3] Revert "address comment" This reverts commit e891effcb4c6b61028efd0c45a8ac2ff5b1bbcba. --- 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 925245b26539..003a3790cedf 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -151,7 +151,7 @@ fi VELOX_SOURCE_DIR="${VELOX_HOME}" # checkout code -TARGET_BUILD_COMMIT="$(git ls-remote $VELOX_REPO refs/heads/$VELOX_BRANCH | awk '{print $1;}')" +TARGET_BUILD_COMMIT="$(git ls-remote $VELOX_REPO $VELOX_BRANCH | awk '{print $1;}' | head -n 1)" if [ -d $VELOX_SOURCE_DIR ]; then echo "Velox source folder $VELOX_SOURCE_DIR already exists..." cd $VELOX_SOURCE_DIR