try to fix linux cross-compilation (x2)

Author: moehreag

.github/workflows/build.yml

@@ -145,9 +145,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           key: linux-cross
-        # The cross containers were updated to ubuntu 24.04 after this commit. This breaks installing python3.12-minimal
-        # See https://github.com/cross-rs/cross/issues/1784 for additional context
-      - run: cargo install cross --git https://github.com/cross-rs/cross --rev 29d00c7803f221f1b3f35e561b03792368fb8339
+      - run: cargo install cross --git https://github.com/cross-rs/cross
       - run: rustup target add ${{ matrix.target }}
       - name: Build
         run: cross build --verbose --target ${{ matrix.target }}

.github/workflows/publish.yml

@@ -230,9 +230,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           key: linux-cross
-        # The cross containers were updated to ubuntu 24.04 after this commit. This breaks installing python3.12-minimal
-        # See https://github.com/cross-rs/cross/issues/1784 for additional context
-      - run: cargo install cross --git https://github.com/cross-rs/cross --rev 29d00c7803f221f1b3f35e561b03792368fb8339
+      - run: cargo install cross --git https://github.com/cross-rs/cross
         # Build the CLI only binary
       - run: cross build --no-default-features --release --target ${{ matrix.target }}
       - run: mv "target/${{ matrix.target }}/release/ornithe-installer-rs" "target/${{ matrix.target }}/release/ornithe-installer-rs-cli.bin"

Cross.toml

@@ -1,5 +1,8 @@
 [build]
 pre-build = [
     "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get --assume-yes install libxcb-render0-dev:$CROSS_DEB_ARCH libxcb-shape0-dev:$CROSS_DEB_ARCH libxcb-xfixes0-dev:$CROSS_DEB_ARCH libxkbcommon-dev:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH libgtk-3-dev:$CROSS_DEB_ARCH"
+    "apt-get update"
+    # https://github.com/cross-rs/cross/issues/1784
+    "apt-get -y install qemu-user-static binfmt-support",
+    "apt-get -y install libxcb-render0-dev:$CROSS_DEB_ARCH libxcb-shape0-dev:$CROSS_DEB_ARCH libxcb-xfixes0-dev:$CROSS_DEB_ARCH libxkbcommon-dev:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH libgtk-3-dev:$CROSS_DEB_ARCH"
 ]