Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(interactive): bump up rustup toolchain version to 1.81.0 to avoid compilation failure #4373

Merged
merged 4 commits into from
Dec 24, 2024
Merged

fix(interactive): bump up rustup toolchain version to 1.81.0 to avoid compilation failure #4373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a58210e
bump up rustup toolchain version to 1.81.0 to avoid compilation failure
BingqingLyu Dec 18, 2024
320a8c8
minor fix
BingqingLyu Dec 23, 2024
c593bdb
Merge branch 'main' into upgrade_rust_version
BingqingLyu Dec 23, 2024
01b5fe4
minor fix
BingqingLyu Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/gss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/k8s-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/graphscope-store.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/interactive.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion k8s/internal/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}; \
Expand Down
4 changes: 2 additions & 2 deletions python/graphscope/gsctl/scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading