Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rust-toolchain.toml #129

Merged
merged 14 commits into from
Dec 18, 2021
Merged

Add rust-toolchain.toml #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2adae06
Add rust-toolchain.toml
nuta Dec 18, 2021
6e4c69b
Try fixing CI builds
nuta Dec 18, 2021
64c4e4a
Try fixing CI builds
nuta Dec 18, 2021
18c857a
Try fixing CI builds
nuta Dec 18, 2021
955d84e
Try fixing CI builds
nuta Dec 18, 2021
94902fd
Try fixing CI builds
nuta Dec 18, 2021
d4fa36f
Try fixing CI builds
nuta Dec 18, 2021
6f1c224
Try fixing CI builds
nuta Dec 18, 2021
0b779d9
Try fixing CI builds
nuta Dec 18, 2021
5fb2008
Try fixing CI builds
nuta Dec 18, 2021
8356614
Try fixing CI
nuta Dec 18, 2021
5ad17f4
Try fixing CI builds
nuta Dec 18, 2021
5d5b1c0
Try fixing CI builds
nuta Dec 18, 2021
255e34d
Try fixing CI
nuta Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ jobs:
with:
python-version: 3.9

- name: Set up Rust
- name: Show toolchain versions
run: |
rustup override set nightly
rustup component add llvm-tools-preview rust-src clippy
rustup show
rustup --version
rustc --version
cargo --version
- name: Install cargo crates
run: cargo install cargo-binutils rustfilt
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ kernel_symbols := $(kernel_elf:.elf=.symbols)

PROGRESS := printf " \\033[1;96m%8s\\033[0m \\033[1;m%s\\033[0m\\n"
PYTHON3 ?= python3
CARGO ?= cargo +nightly
CARGO ?= cargo
BOCHS ?= bochs
NM ?= rust-nm
READELF ?= readelf
Expand Down
3 changes: 3 additions & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "nightly-2021-12-04"
components = [ "rustfmt", "clippy", "llvm-tools-preview", "rust-src" ]