thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update rustc to nightly-2024-04-01

Browse Source
This commit is contained in:
Raúl Marín 2024-04-09 19:16:46 +02:00
parent 88b11f7352
commit 26469c9c10
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/rust_vendor vendored

@ -1 +1 @@
Subproject commit e7859fff9fcaa31256ef76afa1b65687f6814dbd Subproject commit c0706c44aa58775958dac80a33ad2c9de255f499

4
docker/packager/binary-builder/Dockerfile
View File

@ -13,8 +13,8 @@ ENV CARGO_HOME=/rust/cargo
ENV PATH="/rust/cargo/bin:${PATH}" ENV PATH="/rust/cargo/bin:${PATH}"
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \ RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
chmod 777 -R /rust && \ chmod 777 -R /rust && \
rustup toolchain install nightly-2023-07-04 && \ rustup toolchain install nightly-2024-04-01 && \
rustup default nightly-2023-07-04 && \ rustup default nightly-2024-04-01 && \
rustup toolchain remove stable && \ rustup toolchain remove stable && \
rustup component add rust-src && \ rustup component add rust-src && \
rustup target add x86_64-unknown-linux-gnu && \ rustup target add x86_64-unknown-linux-gnu && \

2
rust/VENDOR.md
View File

@ -1,7 +1,7 @@
As we have multiple projects we use a workspace to manage them (it's way simpler and leads to less issues). In order As we have multiple projects we use a workspace to manage them (it's way simpler and leads to less issues). In order
to vendor all the dependencies we need to store both the registry and the packages themselves. to vendor all the dependencies we need to store both the registry and the packages themselves.
Note that this includes the exact `std` dependencies for the rustc version used in CI (currently nightly-2023-07-04), Note that this includes the exact `std` dependencies for the rustc version used in CI (currently nightly-2024-04-01),
so you need to install `rustup component add rust-src` for the specific version. so you need to install `rustup component add rust-src` for the specific version.
* First step: (Re)-generate the Cargo.lock file (run under `workspace/`). * First step: (Re)-generate the Cargo.lock file (run under `workspace/`).