From a58210e95a97b3ad4efe4c0933e7474156afaec7 Mon Sep 17 00:00:00 2001 From: BingqingLyu Date: Wed, 18 Dec 2024 16:10:16 +0800 Subject: [PATCH 1/3] bump up rustup toolchain version to 1.81.0 to avoid compilation failure --- k8s/dockerfiles/graphscope-store.Dockerfile | 2 +- k8s/dockerfiles/interactive.Dockerfile | 2 +- k8s/internal/Makefile | 2 +- python/graphscope/gsctl/scripts/install_deps.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/k8s/dockerfiles/graphscope-store.Dockerfile b/k8s/dockerfiles/graphscope-store.Dockerfile index c079b2aac43b..a2466cf11a51 100644 --- a/k8s/dockerfiles/graphscope-store.Dockerfile +++ b/k8s/dockerfiles/graphscope-store.Dockerfile @@ -14,7 +14,7 @@ COPY --chown=graphscope:graphscope . /home/graphscope/graphscope COPY --chown=graphscope:graphscope ./interactive_engine/assembly/src/conf/maven.settings.xml /home/graphscope/.m2/settings.xml USER graphscope -RUN rustup toolchain install 1.76.0 && rustup default 1.76.0 +RUN rustup toolchain install 1.81.0 && rustup default 1.81.0 RUN cd /home/graphscope/graphscope \ && . ~/.graphscope_env \ diff --git a/k8s/dockerfiles/interactive.Dockerfile b/k8s/dockerfiles/interactive.Dockerfile index 4a818174e5f3..10fb05880510 100644 --- a/k8s/dockerfiles/interactive.Dockerfile +++ b/k8s/dockerfiles/interactive.Dockerfile @@ -18,7 +18,7 @@ RUN cd /home/graphscope/GraphScope/ && \ else \ mkdir /home/graphscope/install; \ . /home/graphscope/.graphscope_env; \ - rustup toolchain install 1.76.0 && rustup default 1.76.0; \ + rustup toolchain install 1.81.0 && rustup default 1.81.0; \ make interactive-install BUILD_TYPE="$profile" INSTALL_PREFIX=/home/graphscope/install; \ fi diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile index 81736ddf4b52..fd3f5b8ea26f 100644 --- a/k8s/internal/Makefile +++ b/k8s/internal/Makefile @@ -110,7 +110,7 @@ graphscope-manylinux2014-py3-nodocker: sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && \ sudo yum install java-11-openjdk-devel -y && \ sudo yum remove java-1.8.0-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-headless -y && \ - rustup toolchain install 1.76.0 && rustup default 1.76.0 && \ + rustup toolchain install 1.81.0 && rustup default 1.81.0 && \ cd $(WORKING_DIR)/../.. && \ if [[ "${PLATFORM}" == "aarch64" ]]; then \ export AUDITWHEEL_PLAT=manylinux2014_${PLATFORM}; \ diff --git a/python/graphscope/gsctl/scripts/install_deps.sh b/python/graphscope/gsctl/scripts/install_deps.sh index e758062cd2c7..dd351f2e019f 100755 --- a/python/graphscope/gsctl/scripts/install_deps.sh +++ b/python/graphscope/gsctl/scripts/install_deps.sh @@ -882,8 +882,8 @@ install_interactive_dependencies() { if ! command -v rustup &>/dev/null; then curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env - rustup install 1.76.0 - rustup default 1.76.0 + rustup install 1.81.0 + rustup default 1.81.0 rustc --version fi # opentelemetry From 320a8c8e54cd755c994a0fdef91ce560df184bb9 Mon Sep 17 00:00:00 2001 From: BingqingLyu Date: Mon, 23 Dec 2024 10:48:58 +0800 Subject: [PATCH 2/3] minor fix --- .github/workflows/gss.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gss.yml b/.github/workflows/gss.yml index 5bf0558997ff..ffd550578596 100644 --- a/.github/workflows/gss.yml +++ b/.github/workflows/gss.yml @@ -79,6 +79,8 @@ jobs: . ${HOME}/.graphscope_env export SCCACHE_DIR=~/.cache/sccache export RUSTC_WRAPPER=/usr/local/bin/sccache + rustup toolchain install 1.81.0 + rustup default 1.81.0 cd ${GITHUB_WORKSPACE}/interactive_engine mvn clean install -P groot -Drust.compile.mode=debug -DskipTests --quiet mvn clean install -Pgroot-data-load --quiet From 01b5fe4adb693b93b646b6951168dea4cc6e0122 Mon Sep 17 00:00:00 2001 From: BingqingLyu Date: Mon, 23 Dec 2024 15:34:19 +0800 Subject: [PATCH 3/3] minor fix --- .github/workflows/k8s-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/k8s-ci.yml b/.github/workflows/k8s-ci.yml index 2eff66e0a1af..66d6909d6b7d 100644 --- a/.github/workflows/k8s-ci.yml +++ b/.github/workflows/k8s-ci.yml @@ -282,6 +282,12 @@ jobs: ~/.cache/sccache key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: 1.81.0 + override: true + - name: Build Artifact run: | . ${HOME}/.graphscope_env @@ -640,6 +646,12 @@ jobs: ~/.cache/sccache key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: 1.81.0 + override: true + - name: Build GIE Experimental Artifacts run: | . ~/.graphscope_env