admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 17:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: update rust version (#44322)

Browse Source 
relate: https://github.com/milvus-io/milvus/issues/44321

Signed-off-by: aoiasd <zhicheng.yue@zilliz.com>
This commit is contained in:
aoiasd 2025-09-12 10:53:57 +08:00 committed by GitHub
parent 662397e487
commit fb58701cbb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/docker/builder/cpu/amazonlinux2023/Dockerfile
View File

@ -58,7 +58,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \
COPY --chown=0:0 build/docker/builder/entrypoint.sh / COPY --chown=0:0 build/docker/builder/entrypoint.sh /
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.83 -y sh -s -- --default-toolchain=1.89 -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH

2
build/docker/builder/cpu/rockylinux8/Dockerfile
View File

@ -45,7 +45,7 @@ RUN dnf -y update && \
RUN pip3 install conan==1.64.1 RUN pip3 install conan==1.64.1
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.83 -y sh -s -- --default-toolchain=1.89 -y
ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH

2
build/docker/builder/cpu/ubuntu20.04/Dockerfile
View File

@ -53,7 +53,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \
COPY --chown=0:0 build/docker/builder/entrypoint.sh / COPY --chown=0:0 build/docker/builder/entrypoint.sh /
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.83 -y sh -s -- --default-toolchain=1.89 -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH

2
build/docker/builder/cpu/ubuntu22.04/Dockerfile
View File

@ -59,7 +59,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \
COPY --chown=0:0 build/docker/builder/entrypoint.sh / COPY --chown=0:0 build/docker/builder/entrypoint.sh /
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.83 -y sh -s -- --default-toolchain=1.89 -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH

2
build/docker/builder/gpu/ubuntu20.04/Dockerfile
View File

@ -87,7 +87,7 @@ RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini
chmod +x /tini chmod +x /tini
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.83 -y sh -s -- --default-toolchain=1.89 -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH

2
build/docker/builder/gpu/ubuntu22.04/Dockerfile
View File

@ -18,7 +18,7 @@ RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.linux-$TARGE
RUN pip3 install conan==1.64.1 RUN pip3 install conan==1.64.1
# Install rust # Install rust
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.83 -y sh -s -- --default-toolchain=1.89 -y
ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH
RUN mkdir /opt/vcpkg && \ RUN mkdir /opt/vcpkg && \

4
internal/core/thirdparty/opendal/CMakeLists.txt vendored
View File

@ -18,10 +18,10 @@ set(GIT_REPOSITORY "https://github.com/apache/opendal.git")
set(GIT_TAG "v0.43.0-rc.2") set(GIT_TAG "v0.43.0-rc.2")
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CARGO_CMD cargo +1.83 build --verbose) set(CARGO_CMD cargo +1.89 build --verbose)
set(TARGET_DIR "debug") set(TARGET_DIR "debug")
else () else ()
set(CARGO_CMD cargo +1.83 build --release --verbose) set(CARGO_CMD cargo +1.89 build --release --verbose)
set(TARGET_DIR "release") set(TARGET_DIR "release")
endif () endif ()

4
internal/core/thirdparty/tantivy/CMakeLists.txt vendored
View File

@ -2,10 +2,10 @@ set(TANTIVY_FEATURES_LIST "" CACHE STRING "List of Cargo features to enable")
string(REPLACE ";" "," TANTIVY_FEATURES "${TANTIVY_FEATURES_LIST}") string(REPLACE ";" "," TANTIVY_FEATURES "${TANTIVY_FEATURES_LIST}")
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CARGO_CMD cargo build) set(CARGO_CMD cargo +1.89 build --verbose)
set(TARGET_DIR "debug") set(TARGET_DIR "debug")
else () else ()
set(CARGO_CMD cargo build --release) set(CARGO_CMD cargo +1.89 build --release --verbose)
set(TARGET_DIR "release") set(TARGET_DIR "release")
endif () endif ()

8
scripts/3rdparty_build.sh
View File

@ -136,15 +136,15 @@ if command -v cargo >/dev/null 2>&1; then
unameOut="$(uname -s)" unameOut="$(uname -s)"
case "${unameOut}" in case "${unameOut}" in
Darwin*) Darwin*)
echo "running on mac os, reinstall rust 1.83" echo "running on mac os, reinstall rust 1.89"
# github will install rust 1.74 by default. # github will install rust 1.74 by default.
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
rustup install 1.83 rustup install 1.89
rustup default 1.83;; rustup default 1.89;;
*) *)
echo "not running on mac os, no need to reinstall rust";; echo "not running on mac os, no need to reinstall rust";;
esac esac
else else
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;} bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.89 -y" || { echo 'rustup install failed'; exit 1;}
source $HOME/.cargo/env source $HOME/.cargo/env
fi fi

12
scripts/install_deps.sh
View File

@ -55,10 +55,10 @@ function install_linux_deps() {
# install rust # install rust
if command -v cargo >/dev/null 2>&1; then if command -v cargo >/dev/null 2>&1; then
echo "cargo exists" echo "cargo exists"
rustup install 1.83 rustup install 1.89
rustup default 1.83 rustup default 1.89
else else
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;} bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.89 -y" || { echo 'rustup install failed'; exit 1;}
source $HOME/.cargo/env source $HOME/.cargo/env
fi fi
} }
@ -80,10 +80,10 @@ function install_mac_deps() {
# install rust # install rust
if command -v cargo >/dev/null 2>&1; then if command -v cargo >/dev/null 2>&1; then
echo "cargo exists" echo "cargo exists"
rustup install 1.83 rustup install 1.89
rustup default 1.83 rustup default 1.89
else else
bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;} bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.89 -y" || { echo 'rustup install failed'; exit 1;}
source $HOME/.cargo/env source $HOME/.cargo/env
fi fi
} }