diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 733933a77..5b7653f72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,7 @@ jobs: - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-22 --all-targets - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-23/default --all-targets - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-24/default --all-targets + - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-25/default --all-targets rustfmt: name: Check rustfmt runs-on: ubuntu-latest @@ -140,6 +141,7 @@ jobs: - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-22 - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-23/default - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-24/default + - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-25/default # Run unreasonably slow tests under release, but only the crates that have # them, and don't bother doing this on most platforms. - run: cargo test -p imgui --release -- --ignored diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml index 4ddf28a45..9a5e2c4ec 100644 --- a/imgui-winit-support/Cargo.toml +++ b/imgui-winit-support/Cargo.toml @@ -16,10 +16,11 @@ winit-20 = { version = ">= 0.20, < 0.22", package = "winit", optional = true } winit-22 = { version = "0.22", package = "winit", optional = true } winit-23 = { version = "0.23", package = "winit", default-features = false, optional = true } winit-24 = { version = "0.24", package = "winit", default-features = false, optional = true } +winit-25 = { version = "0.25", package = "winit", default-features = false, optional = true } [features] -default = ["winit-24"] -test = ["winit-23/default", "winit-24/default"] +default = ["winit-24"] # TODO: Change to winit-25 when glutin has upgraded to it +test = ["winit-23/default", "winit-24/default", "winit-25/default"] # This is phrased as a negative (unlike most features) so that it needs to be # explicitly disabled (and `default-features = false` won't do it). To avoid diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 30e377229..dd10ccebe 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -47,6 +47,7 @@ fn lint_all() -> Result<()> { "winit-22", "winit-23/default", "winit-24/default", + "winit-25/default", ]; for &winit in winits { xshell::cmd!("cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features {winit} --all-targets").run()?; @@ -64,6 +65,7 @@ fn test_all() -> Result<()> { "winit-22", "winit-23/default", "winit-24/default", + "winit-25/default", ]; for &winit in winits { xshell::cmd!("cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features {winit} --all-targets").run()?;