From b466522a7b541217cde2429a993ed7803a0d35af Mon Sep 17 00:00:00 2001 From: KodrAus Date: Sun, 28 May 2023 18:36:42 +1000 Subject: [PATCH 1/2] fix up MSRV build in CI --- .github/workflows/ci.yml | 4 ++-- Cargo.toml | 3 ++- tests/smoke-test/.gitignore | 1 + tests/smoke-test/Cargo.toml | 9 +++++++++ tests/smoke-test/src/main.rs | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 tests/smoke-test/.gitignore create mode 100644 tests/smoke-test/Cargo.toml create mode 100644 tests/smoke-test/src/main.rs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62a5f03..dabf484 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: run: cargo test --all-features msrv: - name: "Tests / MSRV" + name: "Build / MSRV" runs-on: ubuntu-latest steps: - name: Checkout sources @@ -88,7 +88,7 @@ jobs: run: rustup update 1.57.0 - name: Version features - run: cargo +1.57.0 test --features "$VERSION_FEATURES" + run: cargo +1.57.0 build --manifest-path tests/smoke-test/Cargo.toml wasm_bindgen: name: Tests / WebAssembly (wasm-bindgen) diff --git a/Cargo.toml b/Cargo.toml index 1547a88..54e0526 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -180,5 +180,6 @@ features = ["Win32_System_Com"] [workspace] members = [ - "macros" + "macros", + "tests/smoke-test", ] diff --git a/tests/smoke-test/.gitignore b/tests/smoke-test/.gitignore new file mode 100644 index 0000000..03314f7 --- /dev/null +++ b/tests/smoke-test/.gitignore @@ -0,0 +1 @@ +Cargo.lock diff --git a/tests/smoke-test/Cargo.toml b/tests/smoke-test/Cargo.toml new file mode 100644 index 0000000..3f3c5ed --- /dev/null +++ b/tests/smoke-test/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "uuid-smoke-test" +version = "0.0.0" +publish = false +edition = "2018" + +[dependencies.uuid] +path = "../../" +features = ["v1", "v3", "v4", "v5"] diff --git a/tests/smoke-test/src/main.rs b/tests/smoke-test/src/main.rs new file mode 100644 index 0000000..45590d8 --- /dev/null +++ b/tests/smoke-test/src/main.rs @@ -0,0 +1 @@ +fn main() { } From e582a3d1bb26937652bd317be6fba42653de58ed Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Sun, 28 May 2023 18:44:57 +1000 Subject: [PATCH 2/2] Just check v4 for MSRV --- tests/smoke-test/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/smoke-test/Cargo.toml b/tests/smoke-test/Cargo.toml index 3f3c5ed..a1f7639 100644 --- a/tests/smoke-test/Cargo.toml +++ b/tests/smoke-test/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies.uuid] path = "../../" -features = ["v1", "v3", "v4", "v5"] +features = ["v4"]