use cross-rs

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

.github/workflows/dep_rust.yml

@@ -78,13 +78,17 @@ jobs:
       - name: clippy
         if: ${{ (runner.os == 'Windows' )}}
         run: |
-          just clippy ${{ inputs.config }} ${{ inputs.target_triple }}
+          just clippy ${{ inputs.config }} 
           just clippy-guests ${{ inputs.config }}
+        env: 
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
 
       - name: clippy exhaustive check
         if: ${{ (runner.os == 'Linux' )}}
         run: |
-          just clippy-exhaustive ${{ inputs.config }} ${{ inputs.target_triple }}
+          just clippy-exhaustive ${{ inputs.config }}
+        env: 
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
 
       - name: Verify MSRV
         run: ./dev/verify-msrv.sh hyperlight-host hyperlight-guest hyperlight-guest-bin hyperlight-common
@@ -130,58 +134,68 @@ jobs:
           just move-c-guests ${{ inputs.config }}
           
       - name: Build
-        run: just build ${{ inputs.config }} ${{ inputs.target_triple }}
+        run: just build ${{ inputs.config }}
+        env: 
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
 
       - name: Run Rust tests
         env:
           CARGO_TERM_COLOR: always
         run: |
           # with default features
-          just test ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}} ${{ inputs.target_triple }}
+          just test ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}}
 
           # with only one driver enabled (driver mshv/kvm feature is ignored on windows) + seccomp 
-          just test ${{ inputs.config }} seccomp,${{ inputs.hypervisor == 'mshv' && 'mshv2' || inputs.hypervisor == 'mshv3' && 'mshv3' || 'kvm' }} ${{ inputs.target_triple }}
+          just test ${{ inputs.config }} seccomp,${{ inputs.hypervisor == 'mshv' && 'mshv2' || inputs.hypervisor == 'mshv3' && 'mshv3' || 'kvm' }}
 
           # make sure certain cargo features compile
-          just check ${{ inputs.target_triple }}
+          just check
 
           # without any features
-          just test-compilation-no-default-features ${{ inputs.config }} ${{ inputs.target_triple }}
+          just test-compilation-no-default-features ${{ inputs.config }}
+        env: 
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
 
         # One of the examples is flaky on Windows GH runners, so this allows us to disable it for now
       - name: Run Rust examples - windows
         if: ${{ (runner.os == 'Windows') }}
         env:
           CARGO_TERM_COLOR: always
           RUST_LOG: debug
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
         run: just run-rust-examples ${{ inputs.config }}
 
+
       - name: Run Rust examples - linux
         if: false
         env:
           CARGO_TERM_COLOR: always
           RUST_LOG: debug
-        run: just run-rust-examples-linux ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}} ${{ inputs.target_triple }}
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
+        run: just run-rust-examples-linux ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}}
 
       - name: Run Rust Gdb tests - linux
         if: runner.os == 'Linux'
         env:
           CARGO_TERM_COLOR: always
           RUST_LOG: debug
-        run: just test-rust-gdb-debugging ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}} ${{ inputs.target_triple }}
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
+        run: just test-rust-gdb-debugging ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}}
 
       - name: Run Rust Crashdump tests
         env:
           CARGO_TERM_COLOR: always
           RUST_LOG: debug
-        run: just test-rust-crashdump ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}} ${{ inputs.target_triple }}
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
+        run: just test-rust-crashdump ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}}
 
       - name: Run Rust Tracing tests - linux
         if: runner.os == 'Linux'
         env:
           CARGO_TERM_COLOR: always
           RUST_LOG: debug
-        run: just test-rust-tracing ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}} ${{ inputs.target_triple }}
+          TARGET_TRIPLE: ${{ inputs.target_triple }}
+        run: just test-rust-tracing ${{ inputs.config }} ${{ inputs.hypervisor == 'mshv' && 'mshv2' || '""'}}
 
       - name: Download benchmarks from "latest"
         run: just bench-download ${{ runner.os }} ${{ inputs.hypervisor }} ${{ inputs.cpu}} dev-latest # compare to prerelease

Cross.toml

@@ -0,0 +1,9 @@
+[build]
+pre-build = [                                 
+    "apt-get update && apt-get -y install gdb"
+]                 
+
+[build.env]
+passthrough = [
+    "TARGET_TRIPLE", # Some tests invoke Cargo directly and need this to run correctly
+]