From b673542fa8f3c5b56be0c51d1077b75b208fe10f Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 21 Mar 2024 17:51:55 +0000 Subject: [PATCH] Use rust-toolchain.toml and newer rust version Use rust-toolchain.toml file over makefile installation. Signed-off-by: James Sturtevant --- .github/workflows/bvt.yml | 2 -- Makefile | 8 -------- rust-toolchain.toml | 4 ++++ 3 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/bvt.yml b/.github/workflows/bvt.yml index e9917550..af542e33 100644 --- a/.github/workflows/bvt.yml +++ b/.github/workflows/bvt.yml @@ -12,7 +12,6 @@ jobs: uses: actions/checkout@v3 - name: Check run: | - make deps make check make -C compiler check make -C ttrpc-codegen check @@ -28,7 +27,6 @@ jobs: uses: actions/checkout@v3 - name: Build run: | - make deps make make -C compiler make -C ttrpc-codegen diff --git a/Makefile b/Makefile index b0b3082e..97e058b3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -RUST_VERSION = 1.66 - all: debug test # @@ -34,9 +32,3 @@ endif check: cargo fmt --all -- --check cargo clippy --all-targets --all-features -- -D warnings - -.PHONY: deps -deps: - rustup install $(RUST_VERSION) - rustup default $(RUST_VERSION) - rustup component add rustfmt clippy diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..c058c59e --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel="1.77.0" +profile="default" +components=["rustfmt", "clippy"]