From 965f49094b164def50cb866b5eecb6369461d9e5 Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Thu, 18 Jan 2024 18:59:22 +0000 Subject: [PATCH 1/3] 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" From 9c44d42992ed33550d21268b505ddf5c40ed14bf Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Thu, 18 Jan 2024 19:06:45 +0000 Subject: [PATCH 2/3] fixed the commit rev Signed-off-by: jiaxiao zhou --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3b285520..e538aca4 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ build: $(foreach shim,$(SHIMS),build-$(shim)-cross-$(TARGET)) # 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 --rev 5896ed1359642510855ca9ee50ce7fdf75c50e3c#5896ed13; fi + @if [ -z $$(which cross) ]; then cargo install cross --git https://github.com/cross-rs/cross --rev 5896ed1359642510855ca9ee50ce7fdf75c50e3c; fi # build-cross can be be used to build any cross supported target (make build-cross-x86_64-unknown-linux-musl) .PHONY: $(BUILD_TARGETS) From cf0b01327bc33129da9c3b5b8902cbadcdf58dbb Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Fri, 19 Jan 2024 08:34:08 +0000 Subject: [PATCH 3/3] pin rust version to 1.75 Signed-off-by: jiaxiao zhou --- containerd-shim-spin/Cargo.lock | 4 ++-- rust-toolchain.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containerd-shim-spin/Cargo.lock b/containerd-shim-spin/Cargo.lock index d45bd629..d81b16a9 100644 --- a/containerd-shim-spin/Cargo.lock +++ b/containerd-shim-spin/Cargo.lock @@ -6600,8 +6600,8 @@ dependencies = [ [[package]] name = "trigger-sqs" -version = "0.4.0" -source = "git+https://github.com/0xE282B0/spin-trigger-sqs?branch=sql-trigger-library#388501385735ccba16875f37c177191d189c6bcc" +version = "0.5.0" +source = "git+https://github.com/fermyon/spin-trigger-sqs?rev=34ef90888a7374ca53d32654dcf02b3fbfd82119#34ef90888a7374ca53d32654dcf02b3fbfd82119" dependencies = [ "anyhow", "async-trait", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 203d7319..bc568432 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.74.1" +channel = "1.75.0" components = ["clippy", "rustfmt"] targets = ["wasm32-wasi", "wasm32-unknown-unknown"] profile = "default"