From 87d810aff371639996822ad90d0971f1a176bbb0 Mon Sep 17 00:00:00 2001
From: Chance <caznix01@gmail.com>
Date: Fri, 18 Apr 2025 23:22:32 -0400
Subject: [PATCH] feat(ci): use cargo zibuild & xbuild

---
 .forgejo/workflows/build-release.yml | 97 +++++++++-------------------
 1 file changed, 32 insertions(+), 65 deletions(-)

diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index e3d7f9e..08ba874 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -5,58 +5,32 @@ on:
   pull_request:
 
 jobs:
-  setup:
-    name: 🔧 Setup Environment
-    runs-on: ubuntu-latest
-    outputs:
-      cache-hit: ${{ steps.cache-tools.outputs.cache-hit }}
-    steps:
-      - name: 📥 Checkout source
-        uses: https://github.com/actions/checkout@v4
-
-      - name: 🗄️ Cache tools
-        uses: https://github.com/actions/cache@v4
-        id: cache-tools
-        with:
-          path: |
-            ~/.cargo/bin
-            /tmp/zig
-          key: tools-v1-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: 🦀 Install Rust toolchain
-        uses: https://github.com/actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          override: true
-
-      - name: 📦 Install Zig and cargo-zigbuild
-        if: steps.cache-tools.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p /tmp/zig
-          curl -L https://ziglang.org/builds/zig-linux-x86_64-0.11.0.tar.xz | tar -xJ -C /tmp/zig --strip-components=1
-          curl -L https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-          cargo binstall -y cargo-zigbuild
-
   build:
-    name: 🏗️ Build ${{ matrix.target }}
-    needs: setup
+    name: Build ${{ matrix.target }}
     runs-on: ubuntu-latest
+    container: ${{ matrix.container }}
+
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          - aarch64-unknown-linux-gnu
-          - x86_64-pc-windows-msvc
         include:
           - target: x86_64-unknown-linux-gnu
+            container: messense/cargo-zigbuild:latest
             binary_name: zenyx-x86_64-linux
             ext: ""
+
           - target: aarch64-unknown-linux-gnu
+            container: messense/cargo-zigbuild:latest
             binary_name: zenyx-aarch64-linux
             ext: ""
+
+          - target: universal2-apple-darwin
+            container: messense/cargo-zigbuild:latest
+            binary_name: zenyx-universal-macos
+            ext: ""
+
           - target: x86_64-pc-windows-msvc
+            container: messense/cargo-xwin:latest
             binary_name: zenyx-x86_64-windows-msvc.exe
             ext: ".exe"
 
@@ -64,42 +38,35 @@ jobs:
       - name: 📥 Checkout source
         uses: https://github.com/actions/checkout@v4
 
-      - name: 🗄️ Restore tool cache
+      - name: 🧩 Restore Cargo cache
         uses: https://github.com/actions/cache@v4
         with:
           path: |
-            ~/.cargo/bin
-            /tmp/zig
-          key: tools-v1-${{ hashFiles('**/Cargo.lock') }}
+            /usr/local/cargo/registry
+            /usr/local/cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-${{ matrix.target }}-
 
-      - name: 📍 Add Zig to PATH
-        run: echo "/tmp/zig" >> $GITHUB_PATH
-
-      - name: 🎯 Install Rust target
+      - name: 🦀 Install macOS targets
+        if: matrix.target == 'universal2-apple-darwin'
         uses: https://github.com/actions-rs/toolchain@v1
         with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-          override: true
+          target: x86_64-apple-darwin,aarch64-apple-darwin
 
-      - name: 🗄️ Restore Cargo cache
-        uses: https://github.com/actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: cargo-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            cargo-${{ matrix.target }}-
+      - name: 🚀 Build project
+        run: |
+          cargo zigbuild --target ${{ matrix.target }} --release
+        if: matrix.target != 'x86_64-pc-windows-msvc'
 
-      - name: 🚀 Build release binary
-        run: cargo zigbuild --target ${{ matrix.target }} --release
+      - name: 🚀 Build Windows project
+        run: |
+          cargo xwin build --target ${{ matrix.target }} --release
+        if: matrix.target == 'x86_64-pc-windows-msvc'
 
       - name: 📦 Package artifact
-        run: |
-          mkdir -p artifacts
-          cp target/${{ matrix.target }}/release/zenyx${{ matrix.ext }} artifacts/${{ matrix.binary_name }}
+        run: mkdir -p artifacts && cp target/${{ matrix.target }}/release/zenyx${{ matrix.ext }} artifacts/${{ matrix.binary_name }}
 
       - name: ⬆️ Upload artifact
         uses: https://code.forgejo.org/forgejo/upload-artifact@v4