Merge pull request #49 from tidewave-ai/sd-fix-build

cross compile with zig for linux

Author: SteffenDE

.github/workflows/release.yml

@@ -79,6 +79,18 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Install Zig
+        if: startsWith(matrix.platform, 'ubuntu')
+        shell: bash
+        run: |
+          wget -q https://ziglang.org/download/0.15.2/zig-x86_64-linux-0.15.2.tar.xz
+          tar -xf zig-x86_64-linux-0.15.2.tar.xz
+          sudo mv zig-x86_64-linux-0.15.2 /usr/local/zig
+          echo "/usr/local/zig" >> $GITHUB_PATH
+
+      - name: Install zigbuild
+        run: cargo install --locked cargo-zigbuild
+
       - name: Rust cache
         uses: Swatinem/rust-cache@v2
         with:
@@ -92,8 +104,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y \
-            gcc-aarch64-linux-gnu \
-            musl-tools \
             libwebkit2gtk-4.1-dev \
             libgtk-3-dev \
             libayatana-appindicator3-dev \
@@ -173,14 +183,11 @@ jobs:
             echo "Building CLI for $target"
             rustup target add "$target"
 
-            # Set linker for aarch64 cross-compilation
-            if [[ "$target" == "aarch64-unknown-linux-gnu" ]]; then
-              export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
-            elif [[ "$target" == "aarch64-unknown-linux-musl" ]]; then
-              export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-gnu-gcc
+            if [[ "$target" == "aarch64-unknown-linux-gnu" || "$target" == "aarch64-unknown-linux-musl" || "$target" == "x86_64-unknown-linux-musl" ]]; then
+              cargo zigbuild -p tidewave-cli --release --target $target
+            else
+              cargo build -p tidewave-cli --release --target $target
             fi
-
-            cargo build -p tidewave-cli --release --target $target
           done
 
       - name: Sign CLI binaries (macos)

tidewave-core/src/server.rs

@@ -145,7 +145,7 @@ pub async fn serve_http_server_with_shutdown(
     listener: TcpListener,
     shutdown_signal: impl std::future::Future<Output = ()> + Send + 'static,
 ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let _ = rustls::crypto::ring::default_provider().install_default();
+    let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
     let client = Client::builder()
         .use_preconfigured_tls(ClientConfig::with_platform_verifier())
         .build()?;