diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2d4493b..1af7e115 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,8 +132,13 @@ jobs: # python examples - uses: actions/setup-python@v2 + if: runner.os != 'Windows' with: python-version: "3.8" + - uses: actions/setup-python@v2 + if: runner.os == 'Windows' + with: + python-version: "3.10" - name: "Python Dataflow example" run: cargo run --example python-dataflow - name: "Python Operator Dataflow example" @@ -167,8 +172,13 @@ jobs: source /opt/ros/humble/setup.bash && ros2 run turtlesim turtlesim_node & cargo run --example rust-ros2-dataflow --features="ros2-examples" - uses: actions/setup-python@v2 + if: runner.os != 'Windows' with: python-version: "3.8" + - uses: actions/setup-python@v2 + if: runner.os == 'Windows' + with: + python-version: "3.10" - name: "python-ros2-dataflow" timeout-minutes: 30 env: diff --git a/libraries/core/src/lib.rs b/libraries/core/src/lib.rs index cd4d31c3..4d1420ec 100644 --- a/libraries/core/src/lib.rs +++ b/libraries/core/src/lib.rs @@ -61,24 +61,8 @@ pub async fn run(program: S, args: &[&str], pwd: Option<&Path>) -> eyre::Resu where S: AsRef, { - // if platform is windows, use a shell - let mut run = if cfg!(windows) { - let mut run = tokio::process::Command::new("cmd.exe"); - let mut wrapped_args = vec![ - "/c", - program - .as_ref() - .to_str() - .context("Could not get path string")?, - ]; - wrapped_args.extend(args); - run.args(wrapped_args); - run - } else { - let mut run = tokio::process::Command::new(program); - run.args(args); - run - }; + let mut run = tokio::process::Command::new(program); + run.args(args); if let Some(pwd) = pwd { run.current_dir(pwd);