add rust-toolchain.toml

vdaas · Apr 25, 2024 · 9ddfb6e · 9ddfb6e
1 parent 9e7ab08
commit 9ddfb6e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 55 deletions.
diff --git a/Makefile.d/dependencies.mk b/Makefile.d/dependencies.mk
@@ -85,15 +85,8 @@ go/example/deps:
 ## install Rust package dependencies
 rust/deps: \
 	rust/install
-	if [ -x "$(CARGO_HOME)/bin/cargo" ]; then \
-		cd $(ROOTDIR)/rust \
-			&& $(CARGO_HOME)/bin/rustup default stable \
-			&& $(CARGO_HOME)/bin/cargo update \
-			&& cd -;\
-	else \
-		echo "Cargo not found. Please install Cargo or add it to your PATH."; \
-		exit 1; \
-	fi
+	sed -i "2s/channel = \"[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\"/channel = \"$(RUST_VERSION)\"/g" $(ROOTDIR)/rust/rust-toolchain.toml
+	cd $(ROOTDIR)/rust && $(CARGO_HOME)/bin/cargo update && cd -
 
 .PHONY: update/chaos-mesh
 ## update chaos-mesh version

diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk
@@ -163,8 +163,4 @@ rust/install: $(CARGO_HOME)/bin/cargo
 
 $(CARGO_HOME)/bin/cargo:
 	curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} sh -s -- --default-toolchain $(RUST_VERSION) -y
-	source "${CARGO_HOME}/env" \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup install $(RUST_VERSION) \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup toolchain install $(RUST_VERSION) \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup default $(RUST_VERSION) \
-	CARGO_HOME=${CARGO_HOME} RUSTUP_HOME=${RUSTUP_HOME} ${CARGO_HOME}/bin/rustup update
+	source "${CARGO_HOME}/env"
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.77.2"