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 273949008 [GLUTEN-4942][VL] refine vcpkg package script (#5900)
273949008 is described below
commit 2739490083354e68fe7627c1c9880eb266a25edf
Author: Yuan <[email protected]>
AuthorDate: Thu May 30 12:07:02 2024 +0800
[GLUTEN-4942][VL] refine vcpkg package script (#5900)
refines the vcpkg script to allow use the GHA docker image to build
package, with maven cache & ccache
Signed-off-by: Yuan Zhou <[email protected]>
---
dev/package-vcpkg.sh | 5 +++--
dev/vcpkg/Makefile | 12 +++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dev/package-vcpkg.sh b/dev/package-vcpkg.sh
index 3f14f1c90..4a248b556 100755
--- a/dev/package-vcpkg.sh
+++ b/dev/package-vcpkg.sh
@@ -6,9 +6,10 @@ CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
GLUTEN_DIR="$CURRENT_DIR/.."
cd "$GLUTEN_DIR"
-source ./dev/vcpkg/env.sh
+source /opt/rh/devtoolset-9/enable
+source /opt/gluten/dev/vcpkg/env.sh
./dev/buildbundle-veloxbe.sh --build_tests=ON --build_benchmarks=ON
--enable_s3=ON --enable_hdfs=ON
mvn clean package -Pbackends-velox -Pceleborn -Puniffle -Pspark-3.2 -DskipTests
mvn clean package -Pbackends-velox -Pceleborn -Puniffle -Pspark-3.3 -DskipTests
mvn clean package -Pbackends-velox -Pceleborn -Puniffle -Pspark-3.4 -DskipTests
-mvn clean package -Pbackends-velox -Pceleborn -Puniffle -Pspark-3.5 -DskipTests
\ No newline at end of file
+mvn clean package -Pbackends-velox -Pceleborn -Puniffle -Pspark-3.5 -DskipTests
diff --git a/dev/vcpkg/Makefile b/dev/vcpkg/Makefile
index e52393b04..11cd02d88 100644
--- a/dev/vcpkg/Makefile
+++ b/dev/vcpkg/Makefile
@@ -1,4 +1,4 @@
-DOCKER_IMAGE=gluten-builder-vcpkg
+DOCKER_IMAGE=apache/gluten:gluten-vcpkg-builder_2024_05_22
GLUTEN_REPO=$(shell realpath -L ../..)
CCACHE_DIR=$(HOME)/.ccache
@@ -8,12 +8,14 @@ MAVEN_M2_DIR=$(HOME)/.m2
$(info $(GLUTEN_REPO))
.PHONY: docker-image build
-build: docker-image | $(CCACHE_DIR) $(VCPKG_BINARY_CACHE_DIR) $(MAVEN_M2_DIR)
+build: $(CCACHE_DIR) $(VCPKG_BINARY_CACHE_DIR) $(MAVEN_M2_DIR)
docker run --rm -ti \
-v $(GLUTEN_REPO):$(GLUTEN_REPO) \
- -v $(VCPKG_BINARY_CACHE_DIR):/home/build/.cache/vcpkg \
- -v $(MAVEN_M2_DIR):/home/build/.m2 \
- -v $(CCACHE_DIR):/home/build/.ccache \
+ -v $(VCPKG_BINARY_CACHE_DIR):/root/.cache/vcpkg \
+ -v $(MAVEN_M2_DIR):/root/.m2 \
+ -v $(CCACHE_DIR):/root/.ccache \
+ -e http_proxy \
+ -e https_proxy \
--workdir $(GLUTEN_REPO) \
-ti \
$(DOCKER_IMAGE) \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
