diff --git a/.github/workflows/gae.yml b/.github/workflows/gae.yml index 07fea3c0074f..4c13b782ba1b 100644 --- a/.github/workflows/gae.yml +++ b/.github/workflows/gae.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v3 - name: Install latest vineyard - if: true + if: false run: | . /home/graphscope/.graphscope_env sudo pip3 install libclang diff --git a/gs b/gs index d7bb68a0ca1a..3afc60c846d9 100755 --- a/gs +++ b/gs @@ -1030,7 +1030,7 @@ install_vineyard() { -DCMAKE_INSTALL_PREFIX="${V6D_PREFIX}" \ -DBUILD_VINEYARD_TESTS=OFF \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_VINEYARD_PYTHON_BINDINGS=ON \ + -DBUILD_VINEYARD_PYTHON_BINDINGS=ON \ -DBUILD_VINEYARD_GRAPH_WITH_GAR=ON make -j"${jobs}" make install diff --git a/k8s/dockerfiles/analytical.Dockerfile b/k8s/dockerfiles/analytical.Dockerfile index 0dd5e6ad1764..209075837f14 100644 --- a/k8s/dockerfiles/analytical.Dockerfile +++ b/k8s/dockerfiles/analytical.Dockerfile @@ -81,3 +81,5 @@ RUN chmod +x /opt/graphscope/bin/* USER graphscope WORKDIR /home/graphscope + +ENV PATH=${PATH}:/home/graphscope/.local/bin diff --git a/k8s/dockerfiles/coordinator.Dockerfile b/k8s/dockerfiles/coordinator.Dockerfile index 383452c70ee7..ba638ba2adcd 100644 --- a/k8s/dockerfiles/coordinator.Dockerfile +++ b/k8s/dockerfiles/coordinator.Dockerfile @@ -54,7 +54,7 @@ RUN sudo chmod a+wrx /tmp USER graphscope WORKDIR /home/graphscope -ENV PATH ${PATH}:/home/graphscope/.local/bin:/opt/graphscope/bin +ENV PATH=${PATH}:/home/graphscope/.local/bin COPY --from=builder /home/graphscope/install /opt/graphscope/ RUN python3 -m pip install --user --no-cache-dir /opt/graphscope/*.whl && sudo rm -rf /opt/graphscope/*.whl diff --git a/k8s/dockerfiles/graphscope-store.Dockerfile b/k8s/dockerfiles/graphscope-store.Dockerfile index c3669f2e1680..7bd46b90c10e 100644 --- a/k8s/dockerfiles/graphscope-store.Dockerfile +++ b/k8s/dockerfiles/graphscope-store.Dockerfile @@ -38,6 +38,8 @@ RUN sudo chmod a+wrx /tmp USER graphscope WORKDIR /home/graphscope +ENV PATH=${PATH}:/home/graphscope/.local/bin + # init log directory RUN sudo mkdir /var/log/graphscope \ && sudo chown -R $(id -u):$(id -g) /var/log/graphscope diff --git a/k8s/dockerfiles/interactive-experimental.Dockerfile b/k8s/dockerfiles/interactive-experimental.Dockerfile index 912f6acce4d1..ebc0dba69288 100644 --- a/k8s/dockerfiles/interactive-experimental.Dockerfile +++ b/k8s/dockerfiles/interactive-experimental.Dockerfile @@ -37,3 +37,4 @@ RUN sudo chown -R graphscope:graphscope /opt/graphscope USER graphscope WORKDIR /home/graphscope +ENV PATH=${PATH}:/home/graphscope/.local/bin diff --git a/k8s/dockerfiles/interactive.Dockerfile b/k8s/dockerfiles/interactive.Dockerfile index 1a9279c675d9..5d9d4d2579a8 100644 --- a/k8s/dockerfiles/interactive.Dockerfile +++ b/k8s/dockerfiles/interactive.Dockerfile @@ -87,4 +87,4 @@ RUN python3 -m pip install --no-cache-dir vineyard vineyard-io --user USER graphscope WORKDIR /home/graphscope - +ENV PATH=${PATH}:/home/graphscope/.local/bin diff --git a/k8s/dockerfiles/learning.Dockerfile b/k8s/dockerfiles/learning.Dockerfile index b7a0ce2b4845..73178524ced8 100644 --- a/k8s/dockerfiles/learning.Dockerfile +++ b/k8s/dockerfiles/learning.Dockerfile @@ -40,3 +40,5 @@ RUN sudo chmod a+wrx /tmp COPY --from=builder /home/graphscope/install /opt/graphscope/ RUN python3 -m pip install --no-cache-dir /opt/graphscope/*.whl && sudo rm -rf /opt/graphscope/*.whl + +ENV PATH=${PATH}:/home/graphscope/.local/bin diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile index afc1687128f2..247c7b5133d0 100644 --- a/k8s/internal/Makefile +++ b/k8s/internal/Makefile @@ -101,21 +101,6 @@ graphscope-darwin-py3: done graphscope-manylinux2014-py3-nodocker: - cd /tmp && \ - git clone --single-branch --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d && \ - cd /tmp/v6d && \ - git submodule update --init && \ - mkdir -p build && cd build && \ - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/opt/vineyard \ - -DCMAKE_PREFIX_PATH=/opt/graphscope \ - -DOPENSSL_ROOT_DIR=/opt/graphscope \ - -DUSE_EXTERNAL_ETCD_LIBS=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_VINEYARD_TESTS=OFF && \ - make -j$(nproc) && \ - sudo make install && \ - sudo rsync -av /opt/vineyard/ ${GRAPHSCOPE_HOME}/ && \ cd $(WORKING_DIR)/../.. && \ if [[ "${ARCH}" == "aarch64" ]]; then python3 -m pip install grpcio==1.49.1 --no-binary grpcio; \ export AUDITWHEEL_PLAT=manylinux2014_${ARCH}; \