From a2f3dc34f71456cc8690bda9be011ac646ea406a Mon Sep 17 00:00:00 2001 From: Yu Chen Date: Mon, 25 Jul 2022 11:47:07 +0800 Subject: [PATCH] udpate rust-toolchain: nightly-2022-07-20, cargo-utils 0.36 --- .github/workflows/doc-and-test.yml | 4 ++-- os/Makefile | 2 +- rust-toolchain | 1 - rust-toolchain.toml | 4 ++++ 4 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/doc-and-test.yml b/.github/workflows/doc-and-test.yml index 98fdc666..1e6f0b1c 100644 --- a/.github/workflows/doc-and-test.yml +++ b/.github/workflows/doc-and-test.yml @@ -13,7 +13,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-04-11 + toolchain: nightly-2022-07-20 components: rust-src, llvm-tools-preview target: riscv64gc-unknown-none-elf - name: Build doc @@ -32,7 +32,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-04-11 + toolchain: nightly-2022-07-20 components: rust-src, llvm-tools-preview target: riscv64gc-unknown-none-elf - uses: actions-rs/install@v0.1 diff --git a/os/Makefile b/os/Makefile index b38c23a6..0658a5e0 100644 --- a/os/Makefile +++ b/os/Makefile @@ -51,7 +51,7 @@ endif env: (rustup target list | grep "riscv64gc-unknown-none-elf (installed)") || rustup target add $(TARGET) - cargo install cargo-binutils --vers =0.3.3 + cargo install cargo-binutils rustup component add rust-src rustup component add llvm-tools-preview diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index abcacd9b..00000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2022-04-11 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..c56a59e0 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +profile = "minimal" +channel = "nightly-2022-07-20" +components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"] -- GitLab