Skip to content

Commit 9efd4f6

Browse files
authored
Add local python script path to PATH (#2804)
Fixes the CI failures introduced in #2791 --------- Signed-off-by: Tao He <[email protected]>
1 parent 9d5d968 commit 9efd4f6

File tree

9 files changed

+11
-19
lines changed

9 files changed

+11
-19
lines changed

.github/workflows/gae.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@v3
3535

3636
- name: Install latest vineyard
37-
if: true
37+
if: false
3838
run: |
3939
. /home/graphscope/.graphscope_env
4040
sudo pip3 install libclang

gs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ install_vineyard() {
10301030
-DCMAKE_INSTALL_PREFIX="${V6D_PREFIX}" \
10311031
-DBUILD_VINEYARD_TESTS=OFF \
10321032
-DBUILD_SHARED_LIBS=ON \
1033-
-DBUILD_VINEYARD_PYTHON_BINDINGS=ON \
1033+
-DBUILD_VINEYARD_PYTHON_BINDINGS=ON \
10341034
-DBUILD_VINEYARD_GRAPH_WITH_GAR=ON
10351035
make -j"${jobs}"
10361036
make install

k8s/dockerfiles/analytical.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ RUN chmod +x /opt/graphscope/bin/*
8181

8282
USER graphscope
8383
WORKDIR /home/graphscope
84+
85+
ENV PATH=${PATH}:/home/graphscope/.local/bin

k8s/dockerfiles/coordinator.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN sudo chmod a+wrx /tmp
5454
USER graphscope
5555
WORKDIR /home/graphscope
5656

57-
ENV PATH ${PATH}:/home/graphscope/.local/bin:/opt/graphscope/bin
57+
ENV PATH=${PATH}:/home/graphscope/.local/bin
5858

5959
COPY --from=builder /home/graphscope/install /opt/graphscope/
6060
RUN python3 -m pip install --user --no-cache-dir /opt/graphscope/*.whl && sudo rm -rf /opt/graphscope/*.whl

k8s/dockerfiles/graphscope-store.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ RUN sudo chmod a+wrx /tmp
3838
USER graphscope
3939
WORKDIR /home/graphscope
4040

41+
ENV PATH=${PATH}:/home/graphscope/.local/bin
42+
4143
# init log directory
4244
RUN sudo mkdir /var/log/graphscope \
4345
&& sudo chown -R $(id -u):$(id -g) /var/log/graphscope

k8s/dockerfiles/interactive-experimental.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ RUN sudo chown -R graphscope:graphscope /opt/graphscope
3737
USER graphscope
3838
WORKDIR /home/graphscope
3939

40+
ENV PATH=${PATH}:/home/graphscope/.local/bin

k8s/dockerfiles/interactive.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ RUN python3 -m pip install --no-cache-dir vineyard vineyard-io --user
8787
USER graphscope
8888
WORKDIR /home/graphscope
8989

90-
90+
ENV PATH=${PATH}:/home/graphscope/.local/bin

k8s/dockerfiles/learning.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ RUN sudo chmod a+wrx /tmp
4040

4141
COPY --from=builder /home/graphscope/install /opt/graphscope/
4242
RUN python3 -m pip install --no-cache-dir /opt/graphscope/*.whl && sudo rm -rf /opt/graphscope/*.whl
43+
44+
ENV PATH=${PATH}:/home/graphscope/.local/bin

k8s/internal/Makefile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,6 @@ graphscope-darwin-py3:
101101
done
102102

103103
graphscope-manylinux2014-py3-nodocker:
104-
cd /tmp && \
105-
git clone --single-branch --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d && \
106-
cd /tmp/v6d && \
107-
git submodule update --init && \
108-
mkdir -p build && cd build && \
109-
cmake .. \
110-
-DCMAKE_INSTALL_PREFIX=/opt/vineyard \
111-
-DCMAKE_PREFIX_PATH=/opt/graphscope \
112-
-DOPENSSL_ROOT_DIR=/opt/graphscope \
113-
-DUSE_EXTERNAL_ETCD_LIBS=OFF \
114-
-DBUILD_SHARED_LIBS=ON \
115-
-DBUILD_VINEYARD_TESTS=OFF && \
116-
make -j$(nproc) && \
117-
sudo make install && \
118-
sudo rsync -av /opt/vineyard/ ${GRAPHSCOPE_HOME}/ && \
119104
cd $(WORKING_DIR)/../.. && \
120105
if [[ "${ARCH}" == "aarch64" ]]; then python3 -m pip install grpcio==1.49.1 --no-binary grpcio; \
121106
export AUDITWHEEL_PLAT=manylinux2014_${ARCH}; \

0 commit comments

Comments
 (0)