ci: use 'cross' for cross compilation

Author: Xevion

.github/workflows/test.yaml

@@ -40,6 +40,7 @@ jobs:
             target: x86_64-unknown-linux-gnu
           - os: ubuntu-latest
             target: aarch64-unknown-linux-gnu
+            cross: true
           - os: macos-latest
             target: x86_64-apple-darwin
           - os: macos-latest
@@ -65,46 +66,23 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y \
-            pkg-config \
-            libssl-dev \
             gcc-aarch64-linux-gnu \
             libc6-dev-arm64-cross \
             crossbuild-essential-arm64
 
-      - name: Setup cross-compilation environment
-        if: matrix.target.os == 'ubuntu-latest' && matrix.target.target == 'aarch64-unknown-linux-gnu'
+      - name: Install cross
+        if: matrix.target.cross
         run: |
-          # Install cross-compilation tools for ARM64
-          sudo apt-get install -y \
-            gcc-aarch64-linux-gnu \
-            g++-aarch64-linux-gnu \
-            libc6-dev-arm64-cross \
-            gcc-13-aarch64-linux-gnu
-
-          # Set up cross-compilation environment variables
-          echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-          echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV
-          echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-
-          # Set up OpenSSL for cross-compilation (using host libraries)
-          echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
-          echo "OPENSSL_DIR=/usr" >> $GITHUB_ENV
-          echo "OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu" >> $GITHUB_ENV
-          echo "OPENSSL_INCLUDE_DIR=/usr/include" >> $GITHUB_ENV
-
-      - name: Setup native Linux environment
-        if: matrix.target.os == 'ubuntu-latest' && matrix.target.target == 'x86_64-unknown-linux-gnu'
-        run: |
-          # Ensure native build has proper OpenSSL setup
-          echo "OPENSSL_DIR=/usr" >> $GITHUB_ENV
-          echo "OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu" >> $GITHUB_ENV
-          echo "OPENSSL_INCLUDE_DIR=/usr/include" >> $GITHUB_ENV
+          cargo install cross --git https://github.com/cross-rs/cross
 
       - name: Install macOS dependencies
         if: matrix.target.os == 'macos-latest'
         run: |
           brew install pkg-config openssl@3
-
-      - name: Build project
+      - name: Build project (native)
+        if: ${{ !matrix.target.cross }} # default to false if not set
         run: cargo build --target ${{ matrix.target.target }} --features ${{ matrix.feature }}
+
+      - name: Build project (cross-compilation)
+        if: matrix.target.cross
+        run: cross build --release --target=${{ matrix.target.target }} --features ${{ matrix.feature }},vendored-openssl

Cargo.lock

@@ -13,6 +13,7 @@ categories = ["command-line-utilities", "web-programming"]
 default = ["cli"]
 cli = ["clap"]
 server = []
+vendored-openssl = ["reqwest/native-tls-vendored"]
 
 [dependencies]
 anyhow = "1.0.98"
@@ -35,15 +36,8 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 thiserror = "2.0.12"
 serde_json = "1.0.142"
 
-
-
-
 [build-dependencies]
 phf_codegen = "0.12.1"
 serde = { version = "1.0.204", features = ["derive"] }
 saphyr = "0.0.6"
 reqwest = { version = "0.12.5", features = ["blocking"] }
-
-
-
-