DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-20 05:56:32 +00:00
Code Issues Releases Wiki Activity

chore: update toolchain version to 2024-11-05 (#1031)

Browse Source 
* chore: update toolchain version to 2024-11-05

* update dragon reach to e945c217b3

* update dog to 6f2c0c8f12

---------

Co-authored-by: longjin <longjin@DragonOS.org>
This commit is contained in:
linfeng
2024-11-11 21:29:15 +08:00
committed by GitHub
parent 69715438f2
commit 7c28051e8c
99 changed files with 242 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/BUILD_CONTAINER_VERSION
View File

@ -1 +1 @@
v1.5
v1.6

2
tools/Makefile
View File

@ -6,4 +6,4 @@ clean:
@cargo clean
check:
@cargo +nightly-2024-07-23 check --workspace --message-format=json
@cargo +nightly-2024-11-05 check --workspace --message-format=json

16
tools/bootstrap.sh
View File

@ -23,7 +23,7 @@ DEFAULT_INSTALL="false"
export RUSTUP_DIST_SERVER=${RUSTUP_DIST_SERVER:-https://rsproxy.cn}
export RUSTUP_UPDATE_ROOT=${RUSTUP_UPDATE_ROOT:-https://rsproxy.cn/rustup}
export RUST_VERSION="${RUST_VERSION:-nightly-2024-07-23}"
export RUST_VERSION="${RUST_VERSION:-nightly-2024-11-05}"
banner()
{
@ -233,21 +233,21 @@ rustInstall() {
echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引，请耐心等待..."
cargo install cargo-binutils
cargo install bpf-linker
rustup toolchain install nightly-2023-08-15-x86_64-unknown-linux-gnu
rustup toolchain install nightly-2024-11-05-x86_64-unknown-linux-gnu
rustup toolchain install $RUST_VERSION-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2023-08-15-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2024-11-05-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-none --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-none --toolchain nightly-2023-08-15-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-linux-musl --toolchain nightly-2023-08-15-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-none --toolchain nightly-2024-11-05-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-linux-musl --toolchain nightly-2024-11-05-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup toolchain install $RUST_VERSION-riscv64gc-unknown-linux-gnu --force-non-host
rustup toolchain install nightly-2023-08-15-riscv64gc-unknown-linux-gnu --force-non-host
rustup toolchain install nightly-2024-11-05-riscv64gc-unknown-linux-gnu --force-non-host
rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu
rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu
rustup target add riscv64gc-unknown-none-elf --toolchain nightly-2023-08-15-riscv64gc-unknown-linux-gnu
rustup target add riscv64imac-unknown-none-elf --toolchain nightly-2023-08-15-riscv64gc-unknown-linux-gnu
rustup target add riscv64gc-unknown-none-elf --toolchain nightly-2024-11-05-riscv64gc-unknown-linux-gnu
rustup target add riscv64imac-unknown-none-elf --toolchain nightly-2024-11-05-riscv64gc-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
rustup component add rust-src

2
tools/debugging/logmonitor/src/app.rs
View File

@ -110,7 +110,7 @@ pub struct TabsState<'a> {
}
impl<'a> TabsState<'a> {
pub fn new(titles: Vec<&'a str>) -> TabsState {
pub fn new(titles: Vec<&'a str>) -> TabsState<'a> {
TabsState { titles, index: 0 }
}
pub fn next(&mut self) {