Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make CI green #2

Merged
merged 4 commits into from
Oct 9, 2023
Merged

Make CI green #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d313ec2
Remove calloop dep
bwidawsk Oct 9, 2023
0f6e497
Run cargo fmt for CI
bwidawsk Oct 9, 2023
44aa9ac
CI: Add libwayland-dev deps
bwidawsk Oct 9, 2023
2d88977
README: fix dep name
bwidawsk Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install -y libwayland-dev
- name: Setup Rust
uses: actions-rs/toolchain@v1
with:
Expand All @@ -63,6 +64,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- run: sudo apt-get install -y libwayland-dev
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down Expand Up @@ -92,6 +94,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- run: sudo apt-get install -y libwayland-dev
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
Expand Down Expand Up @@ -141,6 +144,8 @@ jobs:
profile: minimal
default: true
override: true
- name: Install libwayland-dev
run: sudo apt-get install -y libdrm-dev libwayland-dev
- name: Cargo cache
uses: actions/cache@v2
with:
Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ rust-version = "1.56.1" # nix
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
calloop = "0.12.2"
container_of = "0.5.1"
memoffset = "0.9.0"
nix = { version = "0.27.1", default-features = false, features = ["signal"] }
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ usage.
Add wlcs-rs as a dependency in `Cargo.toml`
```
[dependencies]
udev = "^0.1.0"
wlcs-rs = "^0.1.0"
```
8 changes: 6 additions & 2 deletions src/ffi_wrappers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ unsafe extern "C" fn create_pointer_ffi<W: Wlcs>(ptr: *mut WlcsDisplayServer) ->
match std::panic::catch_unwind(|| {
let server = unsafe { get_display_server_handle_mut::<W>(ptr) };
assert_eq!(server.wlcs_display_server.version, 3);
let Some(p) = server.wlcs.create_pointer() else { return std::ptr::null_mut() };
let Some(p) = server.wlcs.create_pointer() else {
return std::ptr::null_mut();
};

let handle: *mut PointerHandle<W> = Box::into_raw(Box::new(PointerHandle {
wlcs_pointer: wlcs_pointer::<W>(),
Expand All @@ -233,7 +235,9 @@ unsafe extern "C" fn create_touch_ffi<W: Wlcs>(ptr: *mut WlcsDisplayServer) -> *
match std::panic::catch_unwind(|| {
let server = unsafe { get_display_server_handle_mut::<W>(ptr) };
assert_eq!(server.wlcs_display_server.version, 3);
let Some(t) = server.wlcs.create_touch() else { return std::ptr::null_mut(); };
let Some(t) = server.wlcs.create_touch() else {
return std::ptr::null_mut();
};
let handle: *mut TouchHandle<W> = Box::into_raw(Box::new(TouchHandle {
wlcs_touch: wlcs_touch::<W>(),
t,
Expand Down
Loading