From c8aa1b5d51a637be7aa947ccc707cefcaaa500bd Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:34:27 +0100 Subject: [PATCH] f Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- .github/workflows/main.yml | 9 +++++++-- examples/threads.rs | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c3dfc77..7be74626 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,7 +59,7 @@ jobs: if: startsWith(matrix.platform.os, 'ubuntu') run: | sudo apt update - sudo apt install gcc libxxf86vm-dev libosmesa6-dev libgles2-mesa-dev -y + sudo apt install gcc libxxf86vm-dev libosmesa6-dev libgles2-mesa-dev weston -y - name: Install rust id: toolchain uses: dtolnay/rust-toolchain@stable @@ -70,7 +70,12 @@ jobs: rustup target add ${{ matrix.platform.target }} cargo build --features "${{ matrix.features }}" --target ${{ matrix.platform.target }} - name: Test - if: ${{ matrix.platform.test }} + if: ${{ matrix.platform.test && startsWith(matrix.platform.os, 'ubuntu') }} + run: | + weston --no-config --socket=wl-test-env --backend=headless & + WAYLAND_DISPLAY=wl-test-env cargo test --features "${{ matrix.features }}" --target ${{ matrix.platform.target }} + - name: Test + if: ${{ matrix.platform.test && !startsWith(matrix.platform.os, 'ubuntu') }} run: | cargo test --features "${{ matrix.features }}" --target ${{ matrix.platform.target }} Format: diff --git a/examples/threads.rs b/examples/threads.rs index 96b6fa12..f70f2372 100644 --- a/examples/threads.rs +++ b/examples/threads.rs @@ -27,7 +27,7 @@ use winit::{ #[cfg(feature = "sm-raw-window-handle-05")] use rwh_05::{HasRawDisplayHandle, HasRawWindowHandle}; #[cfg(not(feature = "sm-raw-window-handle-05"))] -use rwh_06::{HasDisplayHandle, HasRawWindowHandle, HasWindowHandle}; +use rwh_06::{HasDisplayHandle, HasRawDisplayHandle, HasRawWindowHandle, HasWindowHandle}; pub mod common;