Skip to content

Commit 8253166

Browse files
authored
enhance: upgrade rust version to 1.83 (#39295) (#40317)
issue: #39254 pr: #39295 Signed-off-by: sunby <[email protected]>
1 parent b553270 commit 8253166

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

build/docker/builder/cpu/amazonlinux2023/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \
5858
COPY --chown=0:0 build/docker/builder/entrypoint.sh /
5959

6060
RUN curl https://sh.rustup.rs -sSf | \
61-
sh -s -- --default-toolchain=1.73 -y
61+
sh -s -- --default-toolchain=1.83 -y
6262

6363
ENV PATH=/root/.cargo/bin:$PATH
6464

build/docker/builder/cpu/rockylinux8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN dnf -y update && \
4545
RUN pip3 install conan==1.64.1
4646
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go
4747
RUN curl https://sh.rustup.rs -sSf | \
48-
sh -s -- --default-toolchain=1.73 -y
48+
sh -s -- --default-toolchain=1.83 -y
4949

5050
ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH
5151

build/docker/builder/cpu/ubuntu20.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \
5353
COPY --chown=0:0 build/docker/builder/entrypoint.sh /
5454

5555
RUN curl https://sh.rustup.rs -sSf | \
56-
sh -s -- --default-toolchain=1.73 -y
56+
sh -s -- --default-toolchain=1.83 -y
5757

5858
ENV PATH=/root/.cargo/bin:$PATH
5959

build/docker/builder/cpu/ubuntu22.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \
5959
COPY --chown=0:0 build/docker/builder/entrypoint.sh /
6060

6161
RUN curl https://sh.rustup.rs -sSf | \
62-
sh -s -- --default-toolchain=1.73 -y
62+
sh -s -- --default-toolchain=1.83 -y
6363

6464
ENV PATH=/root/.cargo/bin:$PATH
6565

build/docker/builder/gpu/ubuntu20.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini
8787
chmod +x /tini
8888

8989
RUN curl https://sh.rustup.rs -sSf | \
90-
sh -s -- --default-toolchain=1.73 -y
90+
sh -s -- --default-toolchain=1.83 -y
9191

9292
ENV PATH=/root/.cargo/bin:$PATH
9393

build/docker/builder/gpu/ubuntu22.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARG
1818
RUN pip3 install conan==1.64.1
1919
# Install rust
2020
RUN curl https://sh.rustup.rs -sSf | \
21-
sh -s -- --default-toolchain=1.73 -y
21+
sh -s -- --default-toolchain=1.83 -y
2222
ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH
2323

2424
RUN mkdir /opt/vcpkg && \

internal/core/thirdparty/opendal/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ set(GIT_REPOSITORY "https://github.com/apache/opendal.git")
1818
set(GIT_TAG "v0.43.0-rc.2")
1919

2020
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
21-
set(CARGO_CMD cargo +1.73 build --verbose)
21+
set(CARGO_CMD cargo +1.83 build --verbose)
2222
set(TARGET_DIR "debug")
2323
else ()
24-
set(CARGO_CMD cargo +1.73 build --release --verbose)
24+
set(CARGO_CMD cargo +1.83 build --release --verbose)
2525
set(TARGET_DIR "release")
2626
endif ()
2727

scripts/3rdparty_build.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ if command -v cargo >/dev/null 2>&1; then
9191
unameOut="$(uname -s)"
9292
case "${unameOut}" in
9393
Darwin*)
94-
echo "running on mac os, reinstall rust 1.73"
94+
echo "running on mac os, reinstall rust 1.83"
9595
# github will install rust 1.74 by default.
9696
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
97-
rustup install 1.73
98-
rustup default 1.73;;
97+
rustup install 1.83
98+
rustup default 1.83;;
9999
*)
100100
echo "not running on mac os, no need to reinstall rust";;
101101
esac
102102
else
103-
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.73 -y" || { echo 'rustup install failed'; exit 1;}
103+
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;}
104104
source $HOME/.cargo/env
105105
fi

scripts/install_deps.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ function install_linux_deps() {
5555
# install rust
5656
if command -v cargo >/dev/null 2>&1; then
5757
echo "cargo exists"
58-
rustup install 1.73
59-
rustup default 1.73
58+
rustup install 1.83
59+
rustup default 1.83
6060
else
61-
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.73 -y" || { echo 'rustup install failed'; exit 1;}
61+
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;}
6262
source $HOME/.cargo/env
6363
fi
6464
}
@@ -80,10 +80,10 @@ function install_mac_deps() {
8080
# install rust
8181
if command -v cargo >/dev/null 2>&1; then
8282
echo "cargo exists"
83-
rustup install 1.73
84-
rustup default 1.73
83+
rustup install 1.83
84+
rustup default 1.83
8585
else
86-
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.73 -y" || { echo 'rustup install failed'; exit 1;}
86+
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;}
8787
source $HOME/.cargo/env
8888
fi
8989
}

0 commit comments

Comments
 (0)