From 1fee2e7848f0d94b481b46c50342231ea2cdbef6 Mon Sep 17 00:00:00 2001 From: Tao He Date: Fri, 15 Jul 2022 11:41:24 +0800 Subject: [PATCH] Refine the build target configuration when building vineyardd releases. Signed-off-by: Tao He --- .github/workflows/build-archlinux-latest.yml | 1 + .github/workflows/build-centos-latest.yaml | 1 + .github/workflows/build-compatibility.yml | 1 + .github/workflows/build-test.yml | 1 + .github/workflows/build-vineyardd-and-wheels-macos.yaml | 2 ++ .github/workflows/docs.yaml | 1 + CMakeLists.txt | 4 ++++ docker/Dockerfile.ubuntu | 1 + docker/Dockerfile.vineyardd | 1 + docker/pypa/Dockerfile.manylinux1-wheel | 1 + vineyard-config.in.cmake | 1 + 11 files changed, 15 insertions(+) diff --git a/.github/workflows/build-archlinux-latest.yml b/.github/workflows/build-archlinux-latest.yml index d1998fa4..5abc51e6 100644 --- a/.github/workflows/build-archlinux-latest.yml +++ b/.github/workflows/build-archlinux-latest.yml @@ -151,6 +151,7 @@ jobs: -DBUILD_VINEYARD_IO=ON \ -DBUILD_VINEYARD_IO_KAFKA=ON \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=ON - name: Build diff --git a/.github/workflows/build-centos-latest.yaml b/.github/workflows/build-centos-latest.yaml index 501d6db4..245091ee 100644 --- a/.github/workflows/build-centos-latest.yaml +++ b/.github/workflows/build-centos-latest.yaml @@ -198,6 +198,7 @@ jobs: -DBUILD_VINEYARD_IO=ON \ -DBUILD_VINEYARD_IO_KAFKA=ON \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=ON - name: Build diff --git a/.github/workflows/build-compatibility.yml b/.github/workflows/build-compatibility.yml index 20d3f8a8..fdf66342 100644 --- a/.github/workflows/build-compatibility.yml +++ b/.github/workflows/build-compatibility.yml @@ -159,6 +159,7 @@ jobs: -DBUILD_VINEYARD_IO=ON \ -DBUILD_VINEYARD_IO_KAFKA=ON \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=ON - name: Build diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 50363c00..cdab2dc5 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -185,6 +185,7 @@ jobs: -DBUILD_VINEYARD_IO=ON \ -DBUILD_VINEYARD_IO_KAFKA=ON \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=ON \ -DBUILD_VINEYARD_FUSE=ON \ -DBUILD_VINEYARD_FUSE_PARQUET=ON \ -DBUILD_VINEYARD_TESTS=ON diff --git a/.github/workflows/build-vineyardd-and-wheels-macos.yaml b/.github/workflows/build-vineyardd-and-wheels-macos.yaml index ca2d739a..94069a4c 100644 --- a/.github/workflows/build-vineyardd-and-wheels-macos.yaml +++ b/.github/workflows/build-vineyardd-and-wheels-macos.yaml @@ -152,6 +152,7 @@ jobs: -DBUILD_VINEYARD_GRAPH=OFF \ -DBUILD_VINEYARD_IO=OFF \ -DBUILD_VINEYARD_MIGRATION=OFF \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=OFF \ -DBUILD_VINEYARD_TESTS_ALL=OFF \ -DBUILD_VINEYARD_PROFILING=OFF @@ -347,6 +348,7 @@ jobs: -DBUILD_VINEYARD_IO=OFF \ -DBUILD_VINEYARD_GRAPH=OFF \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=OFF \ -DBUILD_VINEYARD_TESTS_ALL=OFF \ -DBUILD_VINEYARD_COVERAGE=OFF \ diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 521c80ce..c2d36b74 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -113,6 +113,7 @@ jobs: -DBUILD_VINEYARD_IO=ON \ -DBUILD_VINEYARD_IO_KAFKA=ON \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=ON - name: Code generation diff --git a/CMakeLists.txt b/CMakeLists.txt index 3af9fab2..46cd9a93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -512,6 +512,10 @@ if(BUILD_VINEYARD_GRAPH) set(BUILD_VINEYARD_IO ON) endif() +if(BUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME) + set(BUILD_VINEYARD_BASIC ON) +endif() + if(BUILD_VINEYARD_IO) set(BUILD_VINEYARD_BASIC ON) endif() diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 54afa449..087496cf 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -127,6 +127,7 @@ RUN mkdir build && \ -DBUILD_VINEYARD_GRAPH=OFF \ -DBUILD_VINEYARD_IO=OFF \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=OFF \ -DBUILD_VINEYARD_TESTS_ALL=OFF \ -DBUILD_VINEYARD_PROFILING=OFF && \ diff --git a/docker/Dockerfile.vineyardd b/docker/Dockerfile.vineyardd index fbc6be49..79febdbb 100644 --- a/docker/Dockerfile.vineyardd +++ b/docker/Dockerfile.vineyardd @@ -46,6 +46,7 @@ RUN cd /tmp && \ -DBUILD_VINEYARD_GRAPH=OFF \ -DBUILD_VINEYARD_IO=OFF \ -DBUILD_VINEYARD_MIGRATION=OFF \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=OFF \ -DBUILD_VINEYARD_TESTS_ALL=OFF \ -DBUILD_VINEYARD_PROFILING=OFF && \ diff --git a/docker/pypa/Dockerfile.manylinux1-wheel b/docker/pypa/Dockerfile.manylinux1-wheel index 0a1cc5f5..8b41b406 100644 --- a/docker/pypa/Dockerfile.manylinux1-wheel +++ b/docker/pypa/Dockerfile.manylinux1-wheel @@ -40,6 +40,7 @@ RUN cd /work/v6d && \ -DBUILD_VINEYARD_IO=OFF \ -DBUILD_VINEYARD_GRAPH=OFF \ -DBUILD_VINEYARD_MIGRATION=ON \ + -DBUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME=OFF \ -DBUILD_VINEYARD_TESTS=OFF \ -DBUILD_VINEYARD_TESTS_ALL=OFF \ -DBUILD_VINEYARD_COVERAGE=OFF \ diff --git a/vineyard-config.in.cmake b/vineyard-config.in.cmake index 867572c6..2b20c1c1 100644 --- a/vineyard-config.in.cmake +++ b/vineyard-config.in.cmake @@ -19,6 +19,7 @@ set(BUILD_VINEYARD_IO_KAFKA @BUILD_VINEYARD_IO_KAFKA@) set(BUILD_VINEYARD_GRAPH @BUILD_VINEYARD_GRAPH@) set(BUILD_VINEYARD_MALLOC @BUILD_VINEYARD_MALLOC@) set(BUILD_VINEYARD_MIGRATION @BUILD_VINEYARD_MIGRATION@) +set(BUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME @BUILD_VINEYARD_HOSSEINMOEIN_DATAFRAME@) set(BUILD_VINEYARD_TESTS @BUILD_VINEYARD_TESTS@) set(BUILD_VINEYARD_TESTS_ALL @BUILD_VINEYARD_TESTS_ALL@)