From 757dccd72c49410d4c34574d870485b5c9096215 Mon Sep 17 00:00:00 2001 From: Yadunund Date: Mon, 6 Jan 2025 06:24:15 +0000 Subject: [PATCH 1/2] Pin working version of rclrs Signed-off-by: Yadunund --- .github/workflows/nexus_workcell_editor.yaml | 2 +- nexus_workcell_editor/README.md | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nexus_workcell_editor.yaml b/.github/workflows/nexus_workcell_editor.yaml index 73e5357..67f713a 100644 --- a/.github/workflows/nexus_workcell_editor.yaml +++ b/.github/workflows/nexus_workcell_editor.yaml @@ -34,7 +34,7 @@ jobs: run: | git clone https://github.com/ros2-rust/ros2_rust.git cd ros2_rust - git checkout f45a66f47dc727e3ccb13037a6c57923af1446c7 + git checkout 9a845c17873cbdf49e8017d5f0af6d8f795589cc cd .. vcs import . < ros2_rust/ros2_rust_jazzy.repos - name: rosdep diff --git a/nexus_workcell_editor/README.md b/nexus_workcell_editor/README.md index 51e7be6..8ef4dfb 100644 --- a/nexus_workcell_editor/README.md +++ b/nexus_workcell_editor/README.md @@ -4,18 +4,15 @@ A GUI for assembling workcells from components that is built off [rmf_site](http ## Setup -Install rustup from the Rust website: https://www.rust-lang.org/tools/install - -``` -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -``` - Follow instructions [here](https://github.com/ros2-rust/ros2_rust) to setup ros2_rust. +> Note: Checkout `9a845c17873cbdf49e8017d5f0af6d8f795589cc` commit to include fix for https://github.com/ros2-rust/ros2_rust/issues/449. + ## Build ``` # source the ros distro and ros2_rust workspace. cd ~/ws_nexus +rosdep install --from-paths src --ignore-src --rosdistro # Replace with supported ROS 2 distro, eg. jazzy. colcon build ``` From 0ac6bfa42945420f2b5948ec937439c8f340c6de Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Mon, 6 Jan 2025 16:26:30 +0800 Subject: [PATCH 2/2] Pin home in Cargo.toml Signed-off-by: Luca Della Vedova --- nexus_workcell_editor/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nexus_workcell_editor/Cargo.toml b/nexus_workcell_editor/Cargo.toml index 899d193..510d6d7 100644 --- a/nexus_workcell_editor/Cargo.toml +++ b/nexus_workcell_editor/Cargo.toml @@ -10,6 +10,8 @@ name = "nexus_workcell_editor" [dependencies] bevy = "0.12" bevy_egui = "0.23" +# TODO(luca) Fix upstream by removing the open_url feature from bevy_egui +home = "=0.5.9" # TODO(luca) Just use the version used by site editor once released bevy_impulse = { git = "https://github.com/open-rmf/bevy_impulse", branch = "main" } clap = { version = "4.0.10", features = ["color", "derive", "help", "usage", "suggestions"] }