Merge branch 'dev' into main

1 files changed, 18 insertions, 9 deletions

diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml
index 7938a9d..b820a78 100644
--- a/.github/workflows/semifold-ci.yaml
+++ b/.github/workflows/semifold-ci.yaml
@@ -1,7 +1,7 @@
 name: Semifold CI
 on:
   push:
-    branches: [main]
+    branches: [main, dev]
 
 env:
   CARGO_TERM_COLOR: always
@@ -24,10 +24,11 @@ jobs:
             name: "Linux x86_64 (GNU)"
             target: "x86_64-unknown-linux-gnu"
             args: "--target x86_64-unknown-linux-gnu"
-          # - platform: "ubuntu-latest"
-          #   name: "Linux x86_64 (Musl)"
-          #   target: "x86_64-unknown-linux-musl"
-          #   args: "--target x86_64-unknown-linux-musl"
+          - platform: "ubuntu-latest"
+            name: "Linux x86_64 (Musl)"
+            target: "x86_64-unknown-linux-musl"
+            args: "--target x86_64-unknown-linux-musl"
+            use-cross: true
           - platform: "ubuntu-24.04-arm"
             name: "Linux arm64"
             target: "aarch64-unknown-linux-gnu"
@@ -46,10 +47,11 @@ jobs:
             name: "Windows x86_64 (MSVC)"
             target: "x86_64-pc-windows-msvc"
             args: "--target x86_64-pc-windows-msvc --bundles nsis"
-          # - platform: "windows-latest"
-          #   name: "Windows x86_64 (GNU)"
-          #   target: "x86_64-pc-windows-gnu"
-          #   args: "--target x86_64-pc-windows-gnu --bundles nsis"
+          - platform: "windows-latest"
+            name: "Windows x86_64 (GNU)"
+            target: "x86_64-pc-windows-gnu"
+            args: "--target x86_64-pc-windows-gnu --bundles nsis"
+            rustflags: "-C link-arg=-lws2_32"
           - platform: "windows-11-arm"
             name: "Windows arm64"
             target: "aarch64-pc-windows-msvc"
@@ -83,6 +85,10 @@ jobs:
         with:
           targets: ${{ matrix.target }}
 
+      - name: Install cross (for musl builds)
+        if: matrix.use-cross == true
+        run: cargo install cross
+
       - name: Rust Cache
         uses: swatinem/rust-cache@v2
         with:
@@ -104,8 +110,11 @@ jobs:
         uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RUSTFLAGS: ${{ matrix.rustflags || '' }}
+          CARGO_BUILD_TARGET: ${{ matrix.target }}
         with:
           args: ${{ matrix.args }}
+          command: ${{ matrix.use-cross && 'cross' || 'cargo' }}
 
       - name: Fix AppImage for Wayland (Linux)
         if: startsWith(matrix.platform, 'ubuntu') && !startsWith(matrix.platform, 'macos') && !startsWith(matrix.platform, 'windows')