Skip to content

Commit 26b29b3

Browse files
authored
fix(interactive): bump up rustup toolchain version to 1.81.0 to avoid compilation failure (#4373)
<!-- Thanks for your contribution! please review https://github.com/alibaba/GraphScope/blob/main/CONTRIBUTING.md before opening an issue. --> ## What do these changes do? <!-- Please give a short brief about these changes. --> ## Related issue number <!-- Are there any issues opened that will be resolved by merging this change? --> Fixes #4372
1 parent 6304ca8 commit 26b29b3

File tree

6 files changed

+19
-5
lines changed

6 files changed

+19
-5
lines changed

.github/workflows/gss.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +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.81.0
83+
rustup default 1.81.0
8284
cd ${GITHUB_WORKSPACE}/interactive_engine
8385
mvn clean install -P groot -Drust.compile.mode=debug -DskipTests --quiet
8486
mvn clean install -Pgroot-data-load --quiet

.github/workflows/k8s-ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,12 @@ jobs:
282282
~/.cache/sccache
283283
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
284284

285+
- name: Install Rust
286+
uses: actions-rs/toolchain@v1
287+
with:
288+
toolchain: 1.81.0
289+
override: true
290+
285291
- name: Build Artifact
286292
run: |
287293
. ${HOME}/.graphscope_env
@@ -640,6 +646,12 @@ jobs:
640646
~/.cache/sccache
641647
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
642648

649+
- name: Install Rust
650+
uses: actions-rs/toolchain@v1
651+
with:
652+
toolchain: 1.81.0
653+
override: true
654+
643655
- name: Build GIE Experimental Artifacts
644656
run: |
645657
. ~/.graphscope_env

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.76.0 && rustup default 1.76.0
17+
RUN rustup toolchain install 1.81.0 && rustup default 1.81.0
1818

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

k8s/dockerfiles/interactive.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN cd /home/graphscope/GraphScope/ && \
1818
else \
1919
mkdir /home/graphscope/install; \
2020
. /home/graphscope/.graphscope_env; \
21-
rustup toolchain install 1.76.0 && rustup default 1.76.0; \
21+
rustup toolchain install 1.81.0 && rustup default 1.81.0; \
2222
make interactive-install BUILD_TYPE="$profile" INSTALL_PREFIX=/home/graphscope/install; \
2323
fi
2424

k8s/internal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ graphscope-manylinux2014-py3-nodocker:
110110
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && \
111111
sudo yum install java-11-openjdk-devel -y && \
112112
sudo yum remove java-1.8.0-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-headless -y && \
113-
rustup toolchain install 1.76.0 && rustup default 1.76.0 && \
113+
rustup toolchain install 1.81.0 && rustup default 1.81.0 && \
114114
cd $(WORKING_DIR)/../.. && \
115115
if [[ "${PLATFORM}" == "aarch64" ]]; then \
116116
export AUDITWHEEL_PLAT=manylinux2014_${PLATFORM}; \

python/graphscope/gsctl/scripts/install_deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -882,8 +882,8 @@ install_interactive_dependencies() {
882882
if ! command -v rustup &>/dev/null; then
883883
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
884884
source $HOME/.cargo/env
885-
rustup install 1.76.0
886-
rustup default 1.76.0
885+
rustup install 1.81.0
886+
rustup default 1.81.0
887887
rustc --version
888888
fi
889889
# opentelemetry

0 commit comments

Comments
 (0)