Merge pull request #3 from Eyevinn/fix/ci-trunk-build

srperens · web-flow · commit d57b105277ea · 2025-11-20T12:18:12.000+01:00
Fix CI: Make build.rs gracefully handle missing trunk
diff --git a/.dockerignore b/.dockerignore
@@ -51,3 +51,11 @@ scripts/
 
 # Test data
 test-data/
+
+# Core dumps and debug files
+core-dumps/
+*.core
+gst-debug.log
+
+# Test and development scripts
+*.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,10 @@ env:
   RUST_BACKTRACE: 1
   # Trunk version for caching
   TRUNK_VERSION: "0.21.5"
+  # Disable incremental compilation to avoid deadlocks
+  CARGO_INCREMENTAL: 0
+  # Limit parallel cargo jobs to avoid deadlocks
+  CARGO_BUILD_JOBS: 2
 
 jobs:
   fmt:
@@ -36,6 +40,7 @@ jobs:
   clippy:
     name: Clippy (Backend & MCP)
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
 
@@ -86,6 +91,7 @@ jobs:
   test:
     name: Test Suite
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
 
@@ -110,8 +116,8 @@ jobs:
       - name: Run tests on MCP server
         run: cargo test --package strom-mcp-server --all-features
 
-  build:
-    name: Build (Backend + Frontend + MCP)
+  build-frontend:
+    name: Build Frontend (WASM)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -121,12 +127,6 @@ jobs:
         with:
           targets: wasm32-unknown-unknown
 
-      - name: Cache apt packages
-        uses: awalsh128/cache-apt-pkgs-action@v1
-        with:
-          packages: libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-tools
-          version: 1.1
-
       - name: Cache trunk binary
         id: cache-trunk
         uses: actions/cache@v4
@@ -142,17 +142,83 @@ jobs:
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: build
+          shared-key: frontend-wasm
           cache-on-failure: true
-          # Cache trunk build artifacts
-          cache-directories: |
-            frontend/dist
 
       - name: Build frontend
         run: |
           cd frontend
           trunk build --release
 
+      - name: Upload frontend dist
+        uses: actions/upload-artifact@v4
+        with:
+          name: frontend-dist
+          path: backend/dist
+          retention-days: 1
+
+  build:
+    name: Build ${{ matrix.platform }}
+    needs: build-frontend
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: linux
+            binary_ext: ""
+          - os: windows-latest
+            platform: windows
+            binary_ext: ".exe"
+          - os: macos-latest
+            platform: macos
+            binary_ext: ""
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust stable with WASM target
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-unknown-unknown
+
+      # Linux: Install GStreamer via apt
+      - name: Cache apt packages (Linux)
+        if: matrix.platform == 'linux'
+        uses: awalsh128/cache-apt-pkgs-action@v1
+        with:
+          packages: libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-tools
+          version: 1.1
+
+      # Windows: Install GStreamer and pkg-config via Chocolatey
+      - name: Install GStreamer (Windows)
+        if: matrix.platform == 'windows'
+        run: |
+          choco install pkgconfiglite gstreamer gstreamer-devel --yes --no-progress
+          echo "GSTREAMER_1_0_ROOT_MSVC_X86_64=D:\gstreamer\1.0\msvc_x86_64\" >> $env:GITHUB_ENV
+          echo "D:\gstreamer\1.0\msvc_x86_64\bin" >> $env:GITHUB_PATH
+          echo "PKG_CONFIG_PATH=D:\gstreamer\1.0\msvc_x86_64\lib\pkgconfig" >> $env:GITHUB_ENV
+
+      # macOS: Install GStreamer via Homebrew
+      - name: Install GStreamer (macOS)
+        if: matrix.platform == 'macos'
+        run: |
+          brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
+
+      # Download the pre-built frontend from the frontend build job
+      - name: Download frontend dist
+        uses: actions/download-artifact@v4
+        with:
+          name: frontend-dist
+          path: backend/dist
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: build-${{ matrix.platform }}
+          cache-on-failure: true
+
       - name: Build backend (with embedded frontend)
         run: cargo build --release --package strom-backend
 
@@ -162,13 +228,13 @@ jobs:
       - name: Upload backend binary
         uses: actions/upload-artifact@v4
         with:
-          name: strom-backend
-          path: target/release/strom-backend
+          name: strom-backend-${{ matrix.platform }}
+          path: target/release/strom-backend${{ matrix.binary_ext }}
           retention-days: 7
 
       - name: Upload MCP server binary
         uses: actions/upload-artifact@v4
         with:
-          name: strom-mcp-server
-          path: target/release/strom-mcp-server
+          name: strom-mcp-server-${{ matrix.platform }}
+          path: target/release/strom-mcp-server${{ matrix.binary_ext }}
           retention-days: 7
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -48,4 +48,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
+          # Use build-time annotations for better metadata
+          provenance: true
+          sbom: true
diff --git a/Dockerfile b/Dockerfile
@@ -19,10 +19,11 @@ RUN cargo chef prepare --recipe-path recipe.json
 FROM chef AS builder
 WORKDIR /app
 
-# Install GStreamer development dependencies
+# Install GStreamer development dependencies (including WebRTC plugin)
 RUN apt-get update && apt-get install -y \
     libgstreamer1.0-dev \
     libgstreamer-plugins-base1.0-dev \
+    libgstreamer-plugins-bad1.0-dev \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good \
     gstreamer1.0-plugins-bad \
@@ -31,8 +32,8 @@ RUN apt-get update && apt-get install -y \
     gstreamer1.0-tools \
     && rm -rf /var/lib/apt/lists/*
 
-# Install trunk for building the WASM frontend from binary release
-RUN curl -L https://github.com/trunk-rs/trunk/releases/download/v0.20.3/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C /usr/local/bin
+# Install trunk for building the WASM frontend from binary release (match CI version)
+RUN curl -L https://github.com/trunk-rs/trunk/releases/download/v0.21.5/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C /usr/local/bin
 
 # Add WASM target for frontend compilation
 RUN rustup target add wasm32-unknown-unknown
diff --git a/backend/build.rs b/backend/build.rs
@@ -109,6 +109,28 @@ fn is_dir_empty(dir: &Path) -> Result<bool, std::io::Error> {
 
 /// Build the frontend using trunk
 fn build_frontend(frontend_dir: &Path) {
+    // Check if trunk is available
+    let trunk_check = Command::new("trunk").arg("--version").output();
+
+    if trunk_check.is_err() {
+        println!("cargo:warning=trunk not found - skipping frontend build");
+        println!("cargo:warning=Install trunk with: cargo install trunk");
+        println!("cargo:warning=Backend will compile without embedded frontend");
+
+        // Create empty dist directory with placeholder so RustEmbed doesn't fail
+        let dist_dir = PathBuf::from("dist");
+        if !dist_dir.exists() {
+            fs::create_dir(&dist_dir).expect("Failed to create dist directory");
+        }
+        fs::write(
+            dist_dir.join(".placeholder"),
+            "Frontend not built - trunk not available during compilation",
+        )
+        .expect("Failed to create placeholder file");
+
+        return;
+    }
+
     let status = Command::new("trunk")
         .arg("build")
         .arg("--release")
diff --git a/backend/src/gst/discovery.rs b/backend/src/gst/discovery.rs
@@ -419,8 +419,12 @@ impl ElementDiscovery {
                             (PropertyType::Int { min, max }, default)
                         } else if let Some(param_spec) = pspec.downcast_ref::<glib::ParamSpecLong>()
                         {
-                            let min = param_spec.minimum();
-                            let max = param_spec.maximum();
+                            // Cast glong to i64 for cross-platform compatibility
+                            // glong is i32 on Windows but i64 on Linux
+                            #[allow(clippy::unnecessary_cast)]
+                            let min = param_spec.minimum() as i64;
+                            #[allow(clippy::unnecessary_cast)]
+                            let max = param_spec.maximum() as i64;
                             let default =
                                 std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
                                     pad.property::<i64>(&name)
@@ -446,8 +450,12 @@ impl ElementDiscovery {
                         } else if let Some(param_spec) =
                             pspec.downcast_ref::<glib::ParamSpecULong>()
                         {
-                            let min = param_spec.minimum();
-                            let max = param_spec.maximum();
+                            // Cast gulong to u64 for cross-platform compatibility
+                            // gulong is u32 on Windows but u64 on Linux
+                            #[allow(clippy::unnecessary_cast)]
+                            let min = param_spec.minimum() as u64;
+                            #[allow(clippy::unnecessary_cast)]
+                            let max = param_spec.maximum() as u64;
                             let default =
                                 std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
                                     pad.property::<u64>(&name)
@@ -824,8 +832,12 @@ impl ElementDiscovery {
                             (PropertyType::Int { min, max }, default)
                         } else if let Some(param_spec) = pspec.downcast_ref::<glib::ParamSpecLong>()
                         {
-                            let min = param_spec.minimum();
-                            let max = param_spec.maximum();
+                            // Cast glong to i64 for cross-platform compatibility
+                            // glong is i32 on Windows but i64 on Linux
+                            #[allow(clippy::unnecessary_cast)]
+                            let min = param_spec.minimum() as i64;
+                            #[allow(clippy::unnecessary_cast)]
+                            let max = param_spec.maximum() as i64;
                             let default =
                                 std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
                                     pad.property::<i64>(&name)
@@ -851,8 +863,12 @@ impl ElementDiscovery {
                         } else if let Some(param_spec) =
                             pspec.downcast_ref::<glib::ParamSpecULong>()
                         {
-                            let min = param_spec.minimum();
-                            let max = param_spec.maximum();
+                            // Cast gulong to u64 for cross-platform compatibility
+                            // gulong is u32 on Windows but u64 on Linux
+                            #[allow(clippy::unnecessary_cast)]
+                            let min = param_spec.minimum() as u64;
+                            #[allow(clippy::unnecessary_cast)]
+                            let max = param_spec.maximum() as u64;
                             let default =
                                 std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
                                     pad.property::<u64>(&name)
diff --git a/backend/src/gst/pipeline.rs b/backend/src/gst/pipeline.rs
@@ -2030,8 +2030,8 @@ mod tests {
         flow
     }
 
-    #[test]
-    fn test_create_pipeline() {
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_create_pipeline() {
         gst::init().unwrap();
         let flow = create_test_flow();
         let events = EventBroadcaster::default();
@@ -2040,8 +2040,8 @@ mod tests {
         assert!(manager.is_ok());
     }
 
-    #[test]
-    fn test_start_stop_pipeline() {
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_start_stop_pipeline() {
         gst::init().unwrap();
         let flow = create_test_flow();
         let events = EventBroadcaster::default();
@@ -2063,8 +2063,8 @@ mod tests {
         assert_eq!(state.unwrap(), PipelineState::Null);
     }
 
-    #[test]
-    fn test_invalid_element() {
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_invalid_element() {
         gst::init().unwrap();
         let mut flow = create_test_flow();
         flow.elements[0].element_type = "nonexistentelement".to_string();
@@ -2075,8 +2075,8 @@ mod tests {
         assert!(manager.is_err());
     }
 
-    #[test]
-    fn test_auto_tee_insertion() {
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_auto_tee_insertion() {
         gst::init().unwrap();
 
         // Create a flow with one source and two sinks (should auto-insert a tee)
@@ -2127,8 +2127,8 @@ mod tests {
         assert!(manager.elements.contains_key("auto_tee_src"));
     }
 
-    #[test]
-    fn test_no_tee_insertion_when_not_needed() {
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_no_tee_insertion_when_not_needed() {
         gst::init().unwrap();
 
         let flow = create_test_flow(); // Simple 1-to-1 connection
