Merge pull request #13 from tyler-potyondy/dev/gh-workflow

babble-bridge updates to fix gh workflow CI failures

Author: tyler-potyondy

.github/workflows/devcontainer-cargo-test.yml

@@ -121,26 +121,22 @@ jobs:
       - name: Chown workspace to container UID 1000
         run: sudo chown -R 1000:1000 "$GITHUB_WORKSPACE"
 
-      - name: cargo xtask zephyr-setup --build-from-source && cargo test
+      - name: cargo xtask docker-run zephyr-setup + tests
+        env:
+          # This host-side `cargo xtask ...` invocation runs after the workspace
+          # is chowned for the container user. Keep host artifacts in /tmp so
+          # host Cargo does not need to write under $GITHUB_WORKSPACE/target.
+          CARGO_TARGET_DIR: /tmp/cargo-target-host
         run: |
-          docker run --rm \
-            --platform linux/amd64 \
-            --memory=6g \
-            --memory-swap=14g \
-            -v "$GITHUB_WORKSPACE:/workspace" \
-            -w /workspace \
-            -e CARGO_HOME=/tmp/cargo \
-            -e CARGO_TARGET_DIR=/tmp/target \
-            nrf-sim-bridge:latest \
-            bash -lc '
-              set -euo pipefail
-              echo "=== cargo xtask zephyr-setup --build-from-source ==="
-              cargo xtask zephyr-setup --build-from-source
-              echo "=== cargo test --workspace --lib ==="
-              cargo test --workspace --lib
-              echo "=== cargo test --test integration_test ==="
-              cargo test --test integration_test -- --test-threads=1
-            '
+          cargo xtask docker-run -- bash -lc '
+            set -euo pipefail
+            echo "=== cargo xtask zephyr-setup --build-from-source ==="
+            cargo xtask zephyr-setup --build-from-source
+            echo "=== cargo test --workspace --lib ==="
+            cargo test --workspace --lib
+            echo "=== cargo test --test integration_test ==="
+            cargo test --test integration_test -- --test-threads=1
+          '
 
       - name: Restore workspace permissions for runner
         if: always()

.gitignore

@@ -1,4 +1,5 @@
 /target
+/external
 /nrf
 DESIGN.md
 tests/raw_rpc

Cargo.lock

@@ -2,7 +2,7 @@
 members = [".", "nrf-rpc-codegen", "xtask"]
 
 [workspace.dependencies]
-babble-bridge = "0.1.1"
+babble-bridge = "0.1.3"
 
 [package]
 name = "nrf-rpc"

Cargo.toml

@@ -16,7 +16,7 @@ use nrf_rpc::ble::{
     BtGattDiscoverType, BtGattSubscribeParams, BtLeConnParam, BtLeScanParam, GattDiscoverResult,
     ScanResultData,
 };
-use babble_bridge::{TestProcesses, spawn_zephyr_rpc_server_with_socat};
+use babble_bridge::{LogOutput, TestProcesses, spawn_zephyr_rpc_server_with_socat};
 use nrf_rpc::{RpcClient, TransportError, ble::Ble, uart_transport::{Uart, UartTransport}};
 use std::collections::HashSet;
 use std::io::{Read, Write};
@@ -240,7 +240,7 @@ fn hex_to_bytes(hex: &str) -> Vec<u8> {
         .collect()
 }
 
-const TEST_DIRECTORY_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests");
+const TEST_DIRECTORY_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/sockets");
 const BSIM_BIN_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/external/tools/bsim/bin");
 
 /// One-shot environment precondition check. Runs the first time any test
@@ -311,7 +311,7 @@ type MockTransport = UartTransport<MockUart>;
 fn run_zephyr_rpc_server_exe(test_name: &str) -> (TestProcesses, MockTransport) {
     preflight_check();
     let tests_dir = Path::new(TEST_DIRECTORY_PATH);
-    let (processes, socket_path) = spawn_zephyr_rpc_server_with_socat(tests_dir, test_name);
+    let (processes, socket_path) = spawn_zephyr_rpc_server_with_socat(tests_dir, test_name, LogOutput::Off);
     let socket_path_str = socket_path
         .to_str()
         .expect("socket path must be valid UTF-8");