fix: Doc.rs Build Fails For livekit-api = 0.4.1 (#495)

livekit · Nov 30, 2024 · 9d68b19 · 9d68b19
1 parent 154555b
commit 9d68b19
Show file tree

Hide file tree

Showing 7 changed files with 326 additions and 556 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -43,8 +43,8 @@ jobs:
     steps:
       - name: Install Rust toolchain
         run: |
-          rustup update --no-self-update stable
-          rustup target add ${{ matrix.target }}
+          rustup update --no-self-update nightly
+          rustup target add ${{ matrix.target }} --toolchain nightly
 
       - name: Install linux dependencies
         if: ${{ matrix.os == 'ubuntu-20.04' }}
@@ -57,6 +57,6 @@ jobs:
           submodules: true
 
       - name: Test
-        run: cargo test --release --verbose --target ${{ matrix.target }} -- --nocapture
+        run: cargo +nightly test --release --verbose --target ${{ matrix.target }} -- --nocapture
 
 
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "livekit",
     "livekit-api",
@@ -14,7 +15,7 @@ members = [
 [workspace.dependencies]
 libwebrtc = { version = "0.3.7", path = "libwebrtc" }
 livekit-api = { version = "0.4.1", path = "livekit-api" }
-livekit-ffi = { version = "0.12.2", path = "livekit-ffi" }
+livekit-ffi = { version = "0.12.3", path = "livekit-ffi" }
 livekit-protocol = { version = "0.3.6", path = "livekit-protocol" }
 livekit-runtime = { version = "0.3.1", path = "livekit-runtime" }
 livekit = { version = "0.7.0", path = "livekit" }

diff --git a/livekit-ffi/Cargo.toml b/livekit-ffi/Cargo.toml
@@ -39,7 +39,7 @@ imgproc = "0.3.11"
 jni = "0.21.1"
 
 [build-dependencies]
-webrtc-sys-build = { path = "../webrtc-sys/build", version = "0.3.2" }
+webrtc-sys-build = { path = "../webrtc-sys/build", version = "0.3.5" }
 
 [dev-dependencies]
 livekit-api = { path = "../livekit-api", version = "0.4.1" }

diff --git a/livekit-ffi/build.rs b/livekit-ffi/build.rs
@@ -19,20 +19,34 @@ fn main() {
         return;
     }
 
-    webrtc_sys_build::download_webrtc().unwrap();
-    if env::var("CARGO_CFG_TARGET_OS").unwrap() == "android" {
-        webrtc_sys_build::configure_jni_symbols().unwrap();
+    let webrtc_dir = webrtc_sys_build::webrtc_dir();
+    if !webrtc_dir.exists() {
+        webrtc_sys_build::download_webrtc().unwrap();
     }
 
-    {
-        // Copy the webrtc license to CARGO_MANIFEST_DIR
-        // (used by the ffi release action)
-        let webrtc_dir = webrtc_sys_build::webrtc_dir();
-        let license = webrtc_dir.join("LICENSE.md");
-        let target_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
+    match target_os.as_str() {
+        "windows" => {}
+        "linux" => {
+            // Link webrtc library
+            println!("cargo:rustc-link-lib=static=webrtc");
+        }
+        "android" => {
+            webrtc_sys_build::configure_jni_symbols().unwrap();
+            // Copy the webrtc license to CARGO_MANIFEST_DIR
+            // (used by the ffi release action)
+            let license = webrtc_dir.join("LICENSE.md");
+            let target_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
 
-        let out_file = Path::new(&target_dir).join("WEBRTC_LICENSE.md");
+            let out_file = Path::new(&target_dir).join("WEBRTC_LICENSE.md");
 
-        std::fs::copy(license, out_file).unwrap();
+            std::fs::copy(license, out_file).unwrap();
+        }
+        "macos" => {
+            println!("cargo:rustc-link-arg=-ObjC");
+        }
+        _ => {
+            panic!("Unsupported target, {}", target_os);
+        }
     }
 }