chore: fix github builds (and rustfmt)

Author: xtfer

.github/workflows/build.yml

@@ -4,70 +4,131 @@ name: Release Harmony
 on:
   push:
     tags:
-      - '**'      # match all tags, e.g. 1.0.0, release-1, beta, etc.
+      - '**'      # Match all tags, e.g. 1.0.0, release-1, beta, etc.
   workflow_dispatch:
 
 env:
   CARGO_TERM_COLOR: always
   REGISTRY_GHCR: ghcr.io/aurabx/harmony
   REGISTRY_DOCKERHUB: aurabox/harmony
   IMAGE_NAME: harmony
+  PKG_CONFIG_ALLOW_CROSS: 1
 
 jobs:
-  # ---------- 1. Build binaries ----------
   build-binaries:
-    name: Build Harmony binaries (cross/native)
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-musl
-          - os: ubuntu-latest
-            target: aarch64-unknown-linux-musl
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
+          # Linux (most common distros and containers)
+          - os: ubuntu-22.04
+            target: x86_64-unknown-linux-gnu        # Ubuntu, Debian, Fedora, RHEL, etc.
+          - os: ubuntu-22.04
+            target: aarch64-unknown-linux-gnu       # ARM64 Ubuntu/Debian servers
+
+          # macOS (Intel + Apple Silicon)
           - os: macos-latest
             target: x86_64-apple-darwin
           - os: macos-latest
             target: aarch64-apple-darwin
-    runs-on: ${{ matrix.os }}
+
+          # Windows (x64)
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Cache Rust build
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-all-targets: true
+          # Use different cache for cross-compilation to avoid glibc version conflicts
+          key: ${{ matrix.target }}
+
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.target }}
 
-      # Linux builds use cross
-      - name: Build Harmony (Linux cross)
-        if: runner.os == 'Linux'
-        shell: bash
+      # --- Linux native build dependencies ---
+      - name: Install system dependencies for native Linux builds
+        if: matrix.target == 'x86_64-unknown-linux-gnu'
         run: |
-          cargo install cross --git https://github.com/cross-rs/cross
-          cross build --release --target ${{ matrix.target }}
+          sudo apt-get update
+          sudo apt-get install -y libdbus-1-dev pkg-config libssl-dev
 
-      # Non-Linux builds are native
-      - name: Build Harmony (native)
-        if: runner.os != 'Linux'
-        run: cargo build --release --target ${{ matrix.target }}
+      # --- Cross Compilation Setup (ARM) ---
+      - name: Install cross for ARM builds
+        if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'armv7-unknown-linux-gnueabihf'
+        run: cargo install cross --git https://github.com/cross-rs/cross
 
+      # --- macOS OpenSSL setup ---
+      - name: Install OpenSSL on macOS
+        if: runner.os == 'macOS'
+        run: |
+          brew install --quiet openssl@3 pkg-config
+          echo "OPENSSL_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$(brew --prefix openssl@3)/lib/pkgconfig" >> $GITHUB_ENV
+          echo "LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
+          echo "LDFLAGS=-L$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$(brew --prefix openssl@3)/include" >> $GITHUB_ENV
+
+      # --- Build step per OS ---
+      - name: Build Harmony
+        shell: bash
+        run: |
+          case "${{ runner.os }}" in
+            Windows)
+              echo "Building for Windows..."
+              cargo build --release --target ${{ matrix.target }}
+              ;;
+            macOS)
+              echo "Building for macOS..."
+              cargo build --release --target ${{ matrix.target }}
+              ;;
+            Linux)
+              case "${{ matrix.target }}" in
+                *musl*)
+                  echo "Skipping musl targets due to DBus dependency"
+                  exit 0
+                  ;;
+                aarch64-unknown-linux-gnu|armv7-unknown-linux-gnueabihf)
+                  echo "Building for ARM target ${{ matrix.target }} with cross..."
+                  cross build --release --target ${{ matrix.target }}
+                  ;;
+                *)
+                  echo "Building for Linux target ${{ matrix.target }}..."
+                  cargo build --release --target ${{ matrix.target }}
+                  ;;
+              esac
+              ;;
+          esac
+
+      # --- Package ---
       - name: Package artefacts
         shell: bash
         run: |
           mkdir -p release
-          cp target/${{ matrix.target }}/release/harmony* release/ || true
+          cp target/${{ matrix.target }}/release/harmony* release/ 2>/dev/null || \
+          cp target/${{ matrix.target }}/release/harmony.exe release/ || true
           cd release
-          tar czf harmony-${{ matrix.target }}.tar.gz harmony* || true
+          if [ "${{ runner.os }}" = "Windows" ]; then
+            tar czf harmony-${{ matrix.target }}.tar.gz harmony*.exe || true
+          else
+            tar czf harmony-${{ matrix.target }}.tar.gz harmony* || true
+          fi
 
+      # --- Checksums ---
       - name: Generate SHA256 (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
           Get-FileHash "release/harmony-${{ matrix.target }}.tar.gz" -Algorithm SHA256 |
-            ForEach-Object { $_.Hash } | Out-File "release/harmony-${{ matrix.target }}.sha256" -Encoding ascii
+            ForEach-Object { "$($_.Hash)  harmony-${{ matrix.target }}.tar.gz" } |
+            Out-File "release/harmony-${{ matrix.target }}.sha256" -Encoding ascii
 
       - name: Generate SHA256 (non-Windows)
         if: runner.os != 'Windows'
@@ -86,6 +147,7 @@ jobs:
     name: Build and push multi-arch Docker images
     runs-on: ubuntu-latest
     needs: build-binaries
+    if: startsWith(github.ref, 'refs/tags/')  # Only build Docker images for tags
     permissions:
       contents: read
       packages: write
@@ -99,8 +161,8 @@ jobs:
 
       - name: Prepare Linux binaries
         run: |
-          mv binaries/harmony-x86_64-unknown-linux-musl/harmony harmony-amd64 || true
-          mv binaries/harmony-aarch64-unknown-linux-musl/harmony harmony-arm64 || true
+          mv binaries/harmony-x86_64-unknown-linux-gnu/harmony harmony-amd64 || true
+          mv binaries/harmony-aarch64-unknown-linux-gnu/harmony harmony-arm64 || true
 
       - uses: docker/setup-buildx-action@v3
 
@@ -138,7 +200,7 @@ jobs:
   release:
     name: Publish GitHub Release
     runs-on: ubuntu-latest
-    needs: [build-binaries, docker]
+    needs: [build-binaries]  # Docker runs in parallel, doesn't block release
     if: startsWith(github.ref, 'refs/tags/')
     permissions:
       contents: write
@@ -148,8 +210,8 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ./artifacts
-          pattern: harmony-*           # only match your real binaries
-          merge-multiple: true         # flattens them into one directory
+          pattern: harmony-*           # Only match real binaries
+          merge-multiple: true         # Flattens them into one directory
 
       - name: Generate combined checksums manifest
         shell: bash
@@ -165,5 +227,7 @@ jobs:
           tag_name: ${{ github.ref_name }}
           name: Harmony ${{ github.ref_name }}
           files: ./artifacts/**/*
+          draft: false
+          prerelease: ${{ contains(github.ref, 'beta') }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -62,6 +62,9 @@ chrono = { version = "0.4", features = ["serde"] }
 notify = { version = "6.1", default-features = false, features = ["macos_fsevent"] }
 arc-swap = "1.7"
 
+[features]
+default = []
+
 [dev-dependencies]
 tokio-test = "0.4"
 rsa = { version = "0.9", features = ["pem"] }

Cross.toml

@@ -0,0 +1,22 @@
+[target.x86_64-unknown-linux-gnu]
+pre-build = [
+    "apt-get update && apt-get install -y libdbus-1-dev pkg-config libssl-dev && rm -rf /var/lib/apt/lists/*"
+]
+
+[target.x86_64-unknown-linux-musl]
+pre-build = [
+    "apt-get update && apt-get install -y libdbus-1-dev pkg-config libssl-dev && rm -rf /var/lib/apt/lists/*"
+]
+
+[target.aarch64-unknown-linux-gnu]
+pre-build = [
+    "dpkg --add-architecture arm64",
+    "apt-get update",
+    "apt-get install -y libdbus-1-dev:arm64 pkg-config libssl-dev:arm64",
+    "rm -rf /var/lib/apt/lists/*"
+]
+
+[target.aarch64-unknown-linux-musl]
+pre-build = [
+    "apt-get update && apt-get install -y libdbus-1-dev pkg-config libssl-dev && rm -rf /var/lib/apt/lists/*"
+]