Skip to content

Commit cec161d

Browse files
committed
codex fix ci.
1 parent d8581c1 commit cec161d

15 files changed

Lines changed: 36 additions & 28 deletions

File tree

.github/workflows/build-graphscope-wheels-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
echo "${version}a${time}" > ${GITHUB_WORKSPACE}/VERSION;
7474
fi
7575
76-
python3 -m pip install numpy pandas "grpcio>=1.49" "grpcio-tools>=1.49" "mypy-protobuf>=3.4.0" wheel
76+
python3 -m pip install numpy pandas "grpcio>=1.49" "grpcio-tools>=1.49" "mypy-protobuf>=3.4.0,<3.7" wheel
7777
7878
# build graphscope server wheel
7979
cd ${GITHUB_WORKSPACE}/k8s/internal

.github/workflows/gaia.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Install Rust
5656
uses: actions-rs/toolchain@v1
5757
with:
58-
toolchain: 1.87.0
58+
toolchain: 1.88.0
5959
override: true
6060

6161
- name: Rust Format Check

.github/workflows/gss.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ jobs:
7979
. ${HOME}/.graphscope_env
8080
export SCCACHE_DIR=~/.cache/sccache
8181
export RUSTC_WRAPPER=/usr/local/bin/sccache
82-
rustup toolchain install 1.87.0
83-
rustup default 1.87.0
82+
rustup toolchain install 1.88.0
83+
rustup default 1.88.0
8484
cd ${GITHUB_WORKSPACE}/interactive_engine
8585
mvn clean install -P groot -Drust.compile.mode=debug -DskipTests --quiet
8686
mvn clean install -Pgroot-data-load --quiet

.github/workflows/interactive.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
. /home/graphscope/.cargo/env
130130
which cargo
131131
132-
rustup toolchain install 1.87.0 && rustup default 1.87.0
132+
rustup toolchain install 1.88.0 && rustup default 1.88.0
133133
# build compiler
134134
cd ${GIE_HOME}/
135135
mvn clean install -Pexperimental -DskipTests -q

.github/workflows/k8s-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ jobs:
285285
- name: Install Rust
286286
uses: actions-rs/toolchain@v1
287287
with:
288-
toolchain: 1.87.0
288+
toolchain: 1.88.0
289289
override: true
290290

291291
- name: Build Artifact
@@ -649,7 +649,7 @@ jobs:
649649
- name: Install Rust
650650
uses: actions-rs/toolchain@v1
651651
with:
652-
toolchain: 1.87.0
652+
toolchain: 1.88.0
653653
override: true
654654

655655
- name: Build GIE Experimental Artifacts

.github/workflows/nightly.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ jobs:
2424
with:
2525
submodules: true
2626

27+
- uses: actions/setup-python@v6
28+
with:
29+
python-version: '3.11'
30+
2731
- name: Install Dependencies of GraphScope
2832
run: |
2933
# Due to an observation of changing hostname in github runners,
@@ -43,7 +47,7 @@ jobs:
4347
fi
4448
sudo mkdir /opt/graphscope
4549
sudo chown -R $(id -u):$(id -g) /opt/graphscope
46-
python3 -m pip install click
50+
python3 -m pip install click
4751
python3 gsctl.py install-deps dev --v6d-version v0.23.0
4852
4953
- name: Setup tmate session

.github/workflows/pages-deploy.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ jobs:
3737
- name: Deploy to GitHub Pages
3838
id: deployment
3939
uses: actions/deploy-pages@v4
40+
with:
41+
timeout: 1800000

flex/interactive/sdk/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ gremlinpython >= 3.4.10
88
protobuf>=4
99
grpcio>=1.49
1010
grpcio-tools>=1.49
11-
mypy-protobuf>=3.4.0
11+
mypy-protobuf>=3.4.0,<3.7

k8s/dockerfiles/flex-interactive.Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG ENABLE_COORDINATOR="false"
99
ARG OPTIMIZE_FOR_HOST=OFF
1010
ARG ENABLE_OPENTELMETRY=false
1111
ARG PARALLEL=8
12+
ARG RUST_VERSION=1.88.0
1213

1314
RUN sudo mkdir -p /opt/flex && sudo chown -R graphscope:graphscope /opt/flex/
1415
USER graphscope
@@ -26,7 +27,8 @@ RUN if [ "${ENABLE_OPENTELMETRY}" = "true" ]; then \
2627
COPY --chown=graphscope:graphscope . /home/graphscope/GraphScope
2728

2829
# install flex
29-
RUN . ${HOME}/.cargo/env && cd ${HOME}/GraphScope/flex && \
30+
RUN . ${HOME}/.cargo/env && rustup toolchain install ${RUST_VERSION} && rustup default ${RUST_VERSION} && \
31+
cd ${HOME}/GraphScope/flex && \
3032
git submodule update --init && mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/flex -DBUILD_DOC=OFF -DBUILD_TEST=OFF -DOPTIMIZE_FOR_HOST=${OPTIMIZE_FOR_HOST} -DUSE_STATIC_ARROW=ON && make -j ${PARALLEL} && make install && \
3133
cd ~/GraphScope/interactive_engine/ && mvn clean package -Pexperimental -DskipTests && \
3234
cd ~/GraphScope/interactive_engine/compiler && cp target/compiler-0.0.1-SNAPSHOT.jar /opt/flex/lib/ && \

k8s/dockerfiles/graphscope-store.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ COPY --chown=graphscope:graphscope . /home/graphscope/graphscope
1414
COPY --chown=graphscope:graphscope ./interactive_engine/assembly/src/conf/maven.settings.xml /home/graphscope/.m2/settings.xml
1515

1616
USER graphscope
17-
RUN rustup toolchain install 1.87.0 && rustup default 1.87.0
17+
RUN rustup toolchain install 1.88.0 && rustup default 1.88.0
1818

1919
RUN cd /home/graphscope/graphscope \
2020
&& . ~/.graphscope_env \

0 commit comments

Comments
 (0)