From 965f49094b164def50cb866b5eecb6369461d9e5 Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Thu, 18 Jan 2024 18:59:22 +0000 Subject: [PATCH] ci: pin cross and rust versions Signed-off-by: jiaxiao zhou --- Makefile | 3 ++- rust-toolchain.toml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 565a0566..3b285520 100644 --- a/Makefile +++ b/Makefile @@ -72,9 +72,10 @@ fix: build: $(foreach shim,$(SHIMS),build-$(shim)-cross-$(TARGET)) echo "Build complete" +# pin cross to a specific commit to avoid breaking changes .PHONY: install-cross install-cross: - @if [ -z $$(which cross) ]; then cargo install cross --git https://github.com/cross-rs/cross; fi + @if [ -z $$(which cross) ]; then cargo install cross --git https://github.com/cross-rs/cross --rev 5896ed1359642510855ca9ee50ce7fdf75c50e3c#5896ed13; fi # build-cross can be be used to build any cross supported target (make build-cross-x86_64-unknown-linux-musl) .PHONY: $(BUILD_TARGETS) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index a5176c3a..203d7319 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "stable" +channel = "1.74.1" components = ["clippy", "rustfmt"] targets = ["wasm32-wasi", "wasm32-unknown-unknown"] profile = "default"