small fixes

.github/workflows/ci.yml

@@ -222,7 +222,7 @@ jobs:
         run: cargo test --no-run --locked --all-features --release
 
       - name: cargo test
-        run: cargo nextest run --all-features --release -E "not package(integration_tests)" --profile ci
+        run: cargo nextest run --all-features --release --profile ci
 
       - name: upload artifact
         uses: actions/upload-artifact@v4 # upload test results as artifact
@@ -231,23 +231,6 @@ jobs:
           name: test-results
           path: ${{ github.workspace }}/target/nextest/ci/junit.xml
 
-      - name: cargo test cucumber
-        run: cargo test --release --package integration_tests --test cucumber -- --tags "not @ignore and not @flaky"
-
-      - name: upload test result artifact
-        uses: actions/upload-artifact@v4 # upload test results as artifact
-        if: success() || failure()
-        with:
-          name: cucumber-test-results
-          path: ${{ github.workspace }}/integration_tests/cucumber-output-junit.xml
-
-      - name: Upload cucumber log artifacts
-        uses: actions/upload-artifact@v4
-        if: success() || failure()
-        with:
-          name: cucumber-log-artifacts
-          path: ${{ github.workspace }}/integration_tests/tests/temp/cucumber_*/*.log
-
   # needed for test results
   event_file:
     runs-on: [ ubuntu-latest ]

Cross.toml

@@ -0,0 +1,54 @@
+[build.env]
+passthrough = [
+  "CFLAGS",
+  "TARGET",
+  "RUST_TARGET",
+  "BUILD_TARGET",
+  "CARGO_BUILD_TARGET",
+  "TARGET_CFLAGS",
+  "CC_aarch64_unknown_linux_gnu",
+  "PKG_CONFIG_SYSROOT_DIR",
+  "PKG_CONFIG_ALLOW_CROSS",
+  "RUSTFLAGS",
+  "RUST_BACKTRACE",
+  "RUST_DEBUG",
+  "RUST_LOG",
+  "ARCH",
+  "FEATURES",
+  "ROARING_ARCH",
+  "TARI_NETWORK",
+  "TARI_TARGET_NETWORK",
+  "TARI_NETWORK_DIR",
+]
+
+# Currently needs cross-rs from git
+# ```cargo install cross --git https://github.com/cross-rs/cross```
+[target.aarch64-unknown-linux-gnu]
+image.name = "ubuntu:18.04"
+# targetting is needed for apple silicon
+image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu"]
+pre-build = "./scripts/cross_compile_ubuntu_18-pre-build.sh"
+
+[target.aarch64-unknown-linux-gnu.env]
+passthrough = [
+  "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc",
+  "PKG_CONFIG_SYSROOT_DIR=/usr/lib/aarch64-linux-gnu/",
+  "PKG_CONFIG_ALLOW_CROSS=true",
+]
+
+[target.x86_64-unknown-linux-gnu]
+image = "ubuntu:18.04"
+pre-build = "./scripts/cross_compile_ubuntu_18-pre-build.sh"
+
+[target.riscv64gc-unknown-linux-gnu]
+#image.name = "riscv64/ubuntu:20.04"
+image.name = "ubuntu:20.04"
+image.toolchain = ["linux/riscv64=riscv64gc-unknown-linux-gnu", "linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu"]
+pre-build = "./scripts/cross_compile_ubuntu_18-pre-build.sh"
+
+[target.riscv64gc-unknown-linux-gnu.env]
+passthrough = [
+  "RISCV64GC_UNKNOWN_LINUX_GNU_OPENSSL_NO_VENDOR=true",
+  "PKG_CONFIG_SYSROOT_DIR=/usr/lib/riscv64-linux-gnu/",
+  "PKG_CONFIG_ALLOW_CROSS=true",
+]