diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index 82b1f7a60e..6eb7541374 100644 --- a/build/docker/builder/cpu/amazonlinux2023/Dockerfile +++ b/build/docker/builder/cpu/amazonlinux2023/Dockerfile @@ -58,7 +58,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \ COPY --chown=0:0 build/docker/builder/entrypoint.sh / RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain=1.73 -y + sh -s -- --default-toolchain=1.83 -y ENV PATH=/root/.cargo/bin:$PATH diff --git a/build/docker/builder/cpu/rockylinux8/Dockerfile b/build/docker/builder/cpu/rockylinux8/Dockerfile index 44a75517de..166fa71f71 100644 --- a/build/docker/builder/cpu/rockylinux8/Dockerfile +++ b/build/docker/builder/cpu/rockylinux8/Dockerfile @@ -45,7 +45,7 @@ RUN dnf -y update && \ RUN pip3 install conan==1.64.1 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 RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain=1.73 -y + sh -s -- --default-toolchain=1.83 -y ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index 8f36ce6dc5..addd8d6bcc 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -53,7 +53,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \ COPY --chown=0:0 build/docker/builder/entrypoint.sh / RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain=1.73 -y + sh -s -- --default-toolchain=1.83 -y ENV PATH=/root/.cargo/bin:$PATH diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile index 7802c97519..028553b7b3 100644 --- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile @@ -59,7 +59,7 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \ COPY --chown=0:0 build/docker/builder/entrypoint.sh / RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain=1.73 -y + sh -s -- --default-toolchain=1.83 -y ENV PATH=/root/.cargo/bin:$PATH diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index b8765bce38..c266eba119 100644 --- a/build/docker/builder/gpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu20.04/Dockerfile @@ -87,7 +87,7 @@ RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini chmod +x /tini RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain=1.73 -y + sh -s -- --default-toolchain=1.83 -y ENV PATH=/root/.cargo/bin:$PATH diff --git a/build/docker/builder/gpu/ubuntu22.04/Dockerfile b/build/docker/builder/gpu/ubuntu22.04/Dockerfile index 1047030086..be3c387ac1 100644 --- a/build/docker/builder/gpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu22.04/Dockerfile @@ -18,7 +18,7 @@ RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARG RUN pip3 install conan==1.64.1 # Install rust RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain=1.73 -y + sh -s -- --default-toolchain=1.83 -y ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH RUN mkdir /opt/vcpkg && \ diff --git a/internal/core/thirdparty/opendal/CMakeLists.txt b/internal/core/thirdparty/opendal/CMakeLists.txt index a01f153621..6b78c3966b 100644 --- a/internal/core/thirdparty/opendal/CMakeLists.txt +++ b/internal/core/thirdparty/opendal/CMakeLists.txt @@ -18,10 +18,10 @@ set(GIT_REPOSITORY "https://github.com/apache/opendal.git") set(GIT_TAG "v0.43.0-rc.2") if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CARGO_CMD cargo +1.73 build --verbose) + set(CARGO_CMD cargo +1.83 build --verbose) set(TARGET_DIR "debug") else () - set(CARGO_CMD cargo +1.73 build --release --verbose) + set(CARGO_CMD cargo +1.83 build --release --verbose) set(TARGET_DIR "release") endif () diff --git a/scripts/3rdparty_build.sh b/scripts/3rdparty_build.sh index ec8c6af25c..401bc87ca9 100644 --- a/scripts/3rdparty_build.sh +++ b/scripts/3rdparty_build.sh @@ -91,15 +91,15 @@ if command -v cargo >/dev/null 2>&1; then unameOut="$(uname -s)" case "${unameOut}" in Darwin*) - echo "running on mac os, reinstall rust 1.73" + echo "running on mac os, reinstall rust 1.83" # github will install rust 1.74 by default. # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md - rustup install 1.73 - rustup default 1.73;; + rustup install 1.83 + rustup default 1.83;; *) echo "not running on mac os, no need to reinstall rust";; esac else - bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.73 -y" || { echo 'rustup install failed'; exit 1;} + bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;} source $HOME/.cargo/env fi diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index e947077e72..bb664e2fea 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -55,10 +55,10 @@ function install_linux_deps() { # install rust if command -v cargo >/dev/null 2>&1; then echo "cargo exists" - rustup install 1.73 - rustup default 1.73 + rustup install 1.83 + rustup default 1.83 else - bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.73 -y" || { echo 'rustup install failed'; exit 1;} + bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;} source $HOME/.cargo/env fi } @@ -80,10 +80,10 @@ function install_mac_deps() { # install rust if command -v cargo >/dev/null 2>&1; then echo "cargo exists" - rustup install 1.73 - rustup default 1.73 + rustup install 1.83 + rustup default 1.83 else - bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.73 -y" || { echo 'rustup install failed'; exit 1;} + bash -c "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=1.83 -y" || { echo 'rustup install failed'; exit 1;} source $HOME/.cargo/env fi }