Merge pull request #179 from Tim-Zhang/lock-rust-version

CI: lock Rust version to 1.66
containerd · Mar 24, 2023 · 78de1c5 · 78de1c5
2 parents b2004f7 + 34003e3
commit 78de1c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -1,3 +1,5 @@
+RUST_VERSION = 1.66
+
 all: debug test
 
 #
@@ -30,6 +32,6 @@ check:
 
 .PHONY: deps
 deps:
-	rustup update stable
-	rustup default stable
+	rustup install $(RUST_VERSION)
+	rustup default $(RUST_VERSION)
 	rustup component add rustfmt clippy
diff --git a/compiler/Makefile b/compiler/Makefile
@@ -1,31 +1 @@
-all: debug test
-
-#
-# Build
-#
-
-.PHONY: debug
-debug:
-	cargo build --verbose --all-targets
-
-.PHONY: release
-release:
-	cargo build --release
-
-.PHONY: build
-build: debug
-
-.PHONY: test
-test:
-	cargo test --all-features --verbose
-
-.PHONY: check
-check:
-	cargo fmt --all -- --check
-	cargo clippy --all-targets --all-features -- -D warnings
-
-.PHONY: deps
-deps:
-	rustup update stable
-	rustup default stable
-	rustup component add rustfmt clippy
+include ../Makefile
diff --git a/ttrpc-codegen/Makefile b/ttrpc-codegen/Makefile
@@ -1,35 +1 @@
-all: debug test
-
-#
-# Build
-#
-
-.PHONY: debug
-debug:
-	cargo build --verbose --all-targets
-
-.PHONY: release
-release:
-	cargo build --release
-
-.PHONY: build
-build: debug
-
-#
-# Tests and linters
-#
-
-.PHONY: test
-test:
-	cargo test --verbose
-
-.PHONY: check
-check:
-	cargo fmt --all -- --check
-	cargo clippy --all-targets --all-features -- -D warnings
-
-.PHONY: deps
-deps:
-	rustup update stable
-	rustup default stable
-	rustup component add rustfmt clippy
+include ../Makefile