From 14cfcf29dc79b285cbfee601159d012317cb64a3 Mon Sep 17 00:00:00 2001 From: Hengfei Yang Date: Mon, 28 Jul 2025 11:07:36 +0800 Subject: [PATCH] ci: update rust to nightly-2025-05-20 (#7722) --- .devcontainer/Dockerfile | 4 ++-- .github/workflows/api-testing.yml | 2 +- .github/workflows/build-fork-pr-image.yml | 2 +- .github/workflows/build-pr-image.yml | 4 ++-- .github/workflows/playwright.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- deploy/build/Dockerfile | 4 ++-- deploy/build/Dockerfile.sccache.aarch64 | 5 +++-- deploy/build/Dockerfile.sccache.amd64 | 5 +++-- deploy/build/Dockerfile.tag-debug.aarch64 | 4 ++-- deploy/build/Dockerfile.tag-debug.amd64 | 4 ++-- deploy/build/Dockerfile.tag-simd.amd64 | 4 ++-- deploy/build/Dockerfile.tag.aarch64 | 4 ++-- deploy/build/Dockerfile.tag.amd64 | 4 ++-- deploy/build/buildspec-test.yml | 4 ++-- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 047b003775..a1be925d8d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get install -y protobuf-compiler RUN apt-get install -y cmake curl # RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -RUN rustup toolchain install nightly-2023-10-24 -RUN rustup default nightly-2023-10-24 +RUN rustup toolchain install nightly-2025-05-20 +RUN rustup default nightly-2025-05-20 RUN rustup target add x86_64-unknown-linux-gnu diff --git a/.github/workflows/api-testing.yml b/.github/workflows/api-testing.yml index bcf0e0deec..fa7710c377 100644 --- a/.github/workflows/api-testing.yml +++ b/.github/workflows/api-testing.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2025-03-02 + toolchain: nightly-2025-05-20 - name: Setup Rust Cache uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/build-fork-pr-image.yml b/.github/workflows/build-fork-pr-image.yml index ff0195b8fd..d6d553547f 100644 --- a/.github/workflows/build-fork-pr-image.yml +++ b/.github/workflows/build-fork-pr-image.yml @@ -53,7 +53,7 @@ jobs: - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2025-03-02 + toolchain: nightly-2025-05-20 - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/build-pr-image.yml b/.github/workflows/build-pr-image.yml index 0011e2095a..979db7bd22 100644 --- a/.github/workflows/build-pr-image.yml +++ b/.github/workflows/build-pr-image.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2025-03-02 + toolchain: nightly-2025-05-20 - uses: Swatinem/rust-cache@v2 with: @@ -123,7 +123,7 @@ jobs: - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2025-03-02 + toolchain: nightly-2025-05-20 - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index d275f465af..c737ad3d67 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -59,7 +59,7 @@ jobs: - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2025-03-02 + toolchain: nightly-2025-05-20 targets: x86_64-unknown-linux-gnu - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index f1d7ed9fab..295c87b5ef 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -45,7 +45,7 @@ jobs: - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2025-03-02 + toolchain: nightly-2025-05-20 targets: x86_64-unknown-linux-gnu - uses: taiki-e/install-action@v2 with: diff --git a/deploy/build/Dockerfile b/deploy/build/Dockerfile index ce65af9a08..838c2a26bc 100644 --- a/deploy/build/Dockerfile +++ b/deploy/build/Dockerfile @@ -8,8 +8,8 @@ RUN NODE_OPTIONS="--max-old-space-size=8192" npm run build FROM public.ecr.aws/zinclabs/rust:bookworm-sccache AS builder -# RUN rustup toolchain install nightly-2025-03-02 -# RUN rustup default nightly-2025-03-02 +# RUN rustup toolchain install nightly-2025-05-20 +# RUN rustup default nightly-2025-05-20 # RUN rustup target add x86_64-unknown-linux-gnu # RUN diff -u <(rustc --print cfg) <(rustc -C target-cpu=native --print cfg) RUN rustc --version && sccache --version diff --git a/deploy/build/Dockerfile.sccache.aarch64 b/deploy/build/Dockerfile.sccache.aarch64 index a638601b88..8ed6e8cdc7 100644 --- a/deploy/build/Dockerfile.sccache.aarch64 +++ b/deploy/build/Dockerfile.sccache.aarch64 @@ -1,7 +1,7 @@ FROM public.ecr.aws/docker/library/rust:bookworm -RUN rustup toolchain install nightly-2025-03-02 -RUN rustup default nightly-2025-03-02 +RUN rustup toolchain install nightly-2025-05-20 +RUN rustup default nightly-2025-05-20 RUN rustup target add aarch64-unknown-linux-gnu RUN rustup component add rustfmt clippy llvm-tools RUN cargo install --locked sccache @@ -12,3 +12,4 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/pr && unzip protoc-21.12-linux-aarch_64.zip -d protoc \ && cp protoc/bin/protoc /usr/local/bin/ \ && cp -r protoc/include/google /usr/local/include/ +RUN apt-get update && apt-get install -y libboost-all-dev pkg-config cmake diff --git a/deploy/build/Dockerfile.sccache.amd64 b/deploy/build/Dockerfile.sccache.amd64 index f51ea5bde4..00dc264569 100644 --- a/deploy/build/Dockerfile.sccache.amd64 +++ b/deploy/build/Dockerfile.sccache.amd64 @@ -1,7 +1,7 @@ FROM public.ecr.aws/docker/library/rust:bookworm -RUN rustup toolchain install nightly-2025-03-02 -RUN rustup default nightly-2025-03-02 +RUN rustup toolchain install nightly-2025-05-20 +RUN rustup default nightly-2025-05-20 RUN rustup target add x86_64-unknown-linux-gnu RUN rustup component add rustfmt clippy llvm-tools RUN cargo install --locked sccache @@ -12,3 +12,4 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/pr && unzip protoc-21.12-linux-x86_64.zip -d protoc \ && cp protoc/bin/protoc /usr/local/bin/ \ && cp -r protoc/include/google /usr/local/include/ +RUN apt-get update && apt-get install -y libboost-all-dev pkg-config cmake diff --git a/deploy/build/Dockerfile.tag-debug.aarch64 b/deploy/build/Dockerfile.tag-debug.aarch64 index fe2dc16c62..20c94070a9 100644 --- a/deploy/build/Dockerfile.tag-debug.aarch64 +++ b/deploy/build/Dockerfile.tag-debug.aarch64 @@ -11,8 +11,8 @@ FROM public.ecr.aws/zinclabs/rust:bookworm-sccache AS builder # RUN apt-get install -y protobuf-compiler # RUN apt-get install -y cmake curl -# RUN rustup toolchain install nightly-2025-03-02 -# RUN rustup default nightly-2025-03-02 +# RUN rustup toolchain install nightly-2025-05-20 +# RUN rustup default nightly-2025-05-20 # RUN rustup target add aarch64-unknown-linux-gnu WORKDIR /openobserve diff --git a/deploy/build/Dockerfile.tag-debug.amd64 b/deploy/build/Dockerfile.tag-debug.amd64 index 95e7821e13..9e7aa3729e 100644 --- a/deploy/build/Dockerfile.tag-debug.amd64 +++ b/deploy/build/Dockerfile.tag-debug.amd64 @@ -11,8 +11,8 @@ FROM public.ecr.aws/zinclabs/rust:bookworm-sccache AS builder # RUN apt-get install -y protobuf-compiler # RUN apt-get install -y cmake curl -# RUN rustup toolchain install nightly-2025-03-02 -# RUN rustup default nightly-2025-03-02 +# RUN rustup toolchain install nightly-2025-05-20 +# RUN rustup default nightly-2025-05-20 # RUN rustup target add x86_64-unknown-linux-gnu WORKDIR /openobserve diff --git a/deploy/build/Dockerfile.tag-simd.amd64 b/deploy/build/Dockerfile.tag-simd.amd64 index b61586cf79..541e5d9b51 100644 --- a/deploy/build/Dockerfile.tag-simd.amd64 +++ b/deploy/build/Dockerfile.tag-simd.amd64 @@ -11,8 +11,8 @@ FROM public.ecr.aws/zinclabs/rust:bookworm-sccache AS builder # RUN apt-get install -y protobuf-compiler # RUN apt-get install -y cmake curl -# RUN rustup toolchain install nightly-2025-03-02 -# RUN rustup default nightly-2025-03-02 +# RUN rustup toolchain install nightly-2025-05-20 +# RUN rustup default nightly-2025-05-20 # RUN rustup target add x86_64-unknown-linux-gnu WORKDIR /openobserve diff --git a/deploy/build/Dockerfile.tag.aarch64 b/deploy/build/Dockerfile.tag.aarch64 index 9dd708ea87..a9ea573ecd 100644 --- a/deploy/build/Dockerfile.tag.aarch64 +++ b/deploy/build/Dockerfile.tag.aarch64 @@ -11,8 +11,8 @@ FROM public.ecr.aws/zinclabs/rust:bookworm-sccache AS builder # RUN apt-get install -y protobuf-compiler # RUN apt-get install -y cmake curl -# RUN rustup toolchain install nightly-2025-03-02 -# RUN rustup default nightly-2025-03-02 +# RUN rustup toolchain install nightly-2025-05-20 +# RUN rustup default nightly-2025-05-20 # RUN rustup target add aarch64-unknown-linux-gnu WORKDIR /openobserve diff --git a/deploy/build/Dockerfile.tag.amd64 b/deploy/build/Dockerfile.tag.amd64 index c9404fd04e..57bf878efa 100644 --- a/deploy/build/Dockerfile.tag.amd64 +++ b/deploy/build/Dockerfile.tag.amd64 @@ -11,8 +11,8 @@ FROM public.ecr.aws/zinclabs/rust:bookworm-sccache AS builder # RUN apt-get install -y protobuf-compiler # RUN apt-get install -y cmake curl -# RUN rustup toolchain install nightly-2025-03-02 -# RUN rustup default nightly-2024-07-07 +# RUN rustup toolchain install nightly-2025-05-20 +# RUN rustup default nightly-2025-05-20 # RUN rustup target add x86_64-unknown-linux-gnu WORKDIR /openobserve diff --git a/deploy/build/buildspec-test.yml b/deploy/build/buildspec-test.yml index 218f21e95f..817ee0fde2 100644 --- a/deploy/build/buildspec-test.yml +++ b/deploy/build/buildspec-test.yml @@ -10,9 +10,9 @@ phases: - unzip protoc-21.12-linux-x86_64.zip -d protoc && cp protoc/bin/protoc /usr/local/bin/ && cp -r protoc/include/google /usr/local/include/ - curl https://sh.rustup.rs -sSf | sh -s -- -y - . "$HOME/.cargo/env" - - rustup toolchain install nightly-2025-03-02 + - rustup toolchain install nightly-2025-05-20 - rustup toolchain list - - rustup default nightly-2025-03-02 + - rustup default nightly-2025-05-20 - rustup component add clippy llvm-tools - export RUSTFLAGS='-C target-cpu=native' - rm -rf ~/.cargo/registry