Skip to content

Commit

Permalink
Fix CI build
Browse files Browse the repository at this point in the history
This patch hopefully fixes the issues that made the CI build fail:

-Added the new OBS functions used to the obs crate
-Switched reqwest to use rustls so that we don't need to install OpenSSL for the linux build
  • Loading branch information
Refragg committed Aug 13, 2023
1 parent 7f8a6ea commit ca105cd
Show file tree
Hide file tree
Showing 3 changed files with 166 additions and 1 deletion.
128 changes: 128 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ livesplit-core = { git = "https://github.com/LiveSplit/livesplit-core", features
log = { version = "0.4.6", features = ["serde"] }

# crates needed for the auto splitter management code to work as expected
reqwest = { version = "0.11.18", features = ["blocking"] }
reqwest = { version = "0.11.18", features = ["blocking", "rustls-tls"] }
hyperx = "1.4.0"
quick-xml = { version = "0.29.0", features = ["serialize", "overlapped-lists"] }
serde = { version = "1.0.166", features = ["serde_derive"] }
Expand Down
37 changes: 37 additions & 0 deletions obs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,40 @@ pub extern "C" fn obs_properties_add_button(
) -> *mut obs_property_t {
panic!()
}

pub extern "C" fn obs_properties_add_text(
_props: *mut obs_properties_t,
_name: *const c_char,

Check failure on line 207 in obs/src/lib.rs

View workflow job for this annotation

GitHub Actions / format

Diff in /home/runner/work/obs-livesplit-one/obs-livesplit-one/obs/src/lib.rs
_description: *const c_char,
_text_type: obs_text_type,
) -> *mut obs_property_t {
panic!()
}
pub fn obs_property_set_modified_callback2(
_prop: *mut obs_property_t,
_modified2_callback: obs_property_modified2_t,

Check failure on line 215 in obs/src/lib.rs

View workflow job for this annotation

GitHub Actions / format

Diff in /home/runner/work/obs-livesplit-one/obs-livesplit-one/obs/src/lib.rs
_private: *mut c_void
) {
panic!()
}
pub fn obs_property_set_description(

Check failure on line 220 in obs/src/lib.rs

View workflow job for this annotation

GitHub Actions / format

Diff in /home/runner/work/obs-livesplit-one/obs-livesplit-one/obs/src/lib.rs
_prop: *mut obs_property_t,
_description: *const c_char,
) {
panic!()
}
pub fn obs_property_set_enabled(
_prop: *mut obs_property_t,
_enabled: bool
) {
panic!()
}
pub fn obs_properties_get(
_props: *mut obs_properties_t,
_prop: *const c_char,
) -> *mut obs_property_t {

Check failure on line 235 in obs/src/lib.rs

View workflow job for this annotation

GitHub Actions / format

Diff in /home/runner/work/obs-livesplit-one/obs-livesplit-one/obs/src/lib.rs
panic!()
}
pub fn obs_module_get_config_path(_module: *mut obs_module_t, _file: *const c_char) -> *const c_char {
panic!()
}

0 comments on commit ca105cd

Please sign in to comment.