From 8fa1a675a587893cff5e1371f4f49b3112870602 Mon Sep 17 00:00:00 2001 From: itowlson Date: Tue, 17 Dec 2024 09:14:31 +1300 Subject: [PATCH 1/2] Work around breaking change in `cross` Signed-off-by: itowlson --- .github/actions/spin-ci-dependencies/action.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/spin-ci-dependencies/action.yml b/.github/actions/spin-ci-dependencies/action.yml index 844f266b10..b8a4bfee51 100644 --- a/.github/actions/spin-ci-dependencies/action.yml +++ b/.github/actions/spin-ci-dependencies/action.yml @@ -8,7 +8,7 @@ inputs: type: bool rust-version: description: 'Rust version to setup' - default: '1.79' + default: '1.81' required: false type: string diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 141bda9643..022fbfd31b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ concurrency: env: CARGO_TERM_COLOR: always - RUST_VERSION: 1.79 + RUST_VERSION: 1.81 jobs: dependency-review: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c78d47fa95..5d9ee73810 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ on: concurrency: ${{ github.workflow }}-${{ github.ref }} env: - RUST_VERSION: 1.79 + RUST_VERSION: 1.81 jobs: build-and-sign: diff --git a/Cargo.toml b/Cargo.toml index faee0c509b..a9bd7b5025 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" license = "Apache-2.0 WITH LLVM-exception" homepage = "https://developer.fermyon.com/spin" repository = "https://github.com/fermyon/spin" -rust-version = "1.79" +rust-version = "1.81" [dependencies] anyhow = { workspace = true } From 491bc730f3a4804a0442fe3763ec102a00e86c72 Mon Sep 17 00:00:00 2001 From: itowlson Date: Tue, 17 Dec 2024 09:45:23 +1300 Subject: [PATCH 2/2] For now, allow the ! fallback lint Signed-off-by: itowlson --- tests/integration.rs | 1 + tests/testcases/mod.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/integration.rs b/tests/integration.rs index 4b14a1e8a9..442ee3a8d9 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -98,6 +98,7 @@ mod integration_tests { #[test] #[cfg(feature = "extern-dependencies-tests")] + #[allow(dependency_on_unit_never_type_fallback)] /// Test that basic redis trigger support works fn redis_smoke_test() -> anyhow::Result<()> { use anyhow::Context; diff --git a/tests/testcases/mod.rs b/tests/testcases/mod.rs index 358518b510..a6f5ad6c90 100644 --- a/tests/testcases/mod.rs +++ b/tests/testcases/mod.rs @@ -204,6 +204,7 @@ pub fn http_smoke_test_template_with_route( /// Run a smoke test for a `spin new` redis template #[cfg(feature = "extern-dependencies-tests")] +#[allow(dependency_on_unit_never_type_fallback)] pub fn redis_smoke_test_template( template_name: &str, template_url: Option<&str>,