try cross again

Author: xtfer

.github/workflows/build.yml

@@ -52,27 +52,9 @@ jobs:
           targets: ${{ matrix.target }}
 
       # --- Cross Compilation Setup (ARM) ---
-      - name: Install ARM cross-compiler toolchains and OpenSSL deps
+      - name: Install cross for ARM builds
         if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'armv7-unknown-linux-gnueabihf'
-        run: |
-          sudo dpkg --add-architecture arm64
-          sudo dpkg --add-architecture armhf
-
-          # Add ARM-specific sources pointing to ports.ubuntu.com
-          echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm-cross.list
-          echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm-cross.list
-          echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm-cross.list
-
-          sudo apt-get update
-          sudo apt-get install -y \
-            pkg-config \
-            gcc-aarch64-linux-gnu \
-            gcc-arm-linux-gnueabihf \
-            libssl-dev:arm64 \
-            libssl-dev:armhf
-
-          echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/lib/arm-linux-gnueabihf/pkgconfig" >> $GITHUB_ENV
-          echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV
+        run: cargo install cross --git https://github.com/cross-rs/cross
 
       # --- macOS OpenSSL setup ---
       - name: Install OpenSSL on macOS
@@ -104,6 +86,10 @@ jobs:
                   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 }}

Cross.toml

@@ -10,7 +10,10 @@ pre-build = [
 
 [target.aarch64-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/*"
+    "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]