Merge remote-tracking branch 'upstream/main'

1 files changed, 20 insertions, 9 deletions

diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml
index 7938a9d..9a91518 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,12 @@ 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"
+            install-musl: true
+            pkg-config-allow-cross: true
           - platform: "ubuntu-24.04-arm"
             name: "Linux arm64"
             target: "aarch64-unknown-linux-gnu"
@@ -46,10 +48,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"
@@ -65,6 +68,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev libfuse2
 
+      - name: Install Musl Tools (for musl target)
+        if: matrix.install-musl == true
+        run: |
+          sudo apt-get install -y musl-tools musl-dev
+
       - name: Install pnpm
         uses: pnpm/action-setup@v4
 
@@ -104,6 +112,9 @@ jobs:
         uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RUSTFLAGS: ${{ matrix.rustflags || '' }}
+          CARGO_BUILD_TARGET: ${{ matrix.target }}
+          PKG_CONFIG_ALLOW_CROSS: ${{ matrix.pkg-config-allow-cross && '1' || '' }}
         with:
           args: ${{ matrix.args }}