Merged
Conversation
* Update to use Harmonic * Add "third-party" rosdep from OSRF for gazebo deps. * Added comment on "user ROOT" rather than sudo, joined two adjacent apt-get install steps. * Correct error in comment --------- Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit 8a4e05a)
Merged
evan-palmer
added a commit
that referenced
this pull request
Aug 9, 2024
* Updated controller manager launch in demo * Resolved bug in BlueROV2 Heavy and Heavy Reach launch configurations (#193) (#194) * Fixed ardusub_gazebo install and mavros configurations * Remapped controller manager topic to robot state publisher topic * Added missing gstreamer dependency (cherry picked from commit 9ddb154) Co-authored-by: Evan Palmer <evanp922@gmail.com> * Added additional resources for USB/IP tutorial (#196) (#198) (cherry picked from commit 531ed83) Co-authored-by: Evan Palmer <evanp922@gmail.com> * Bump docker/build-push-action from 6.1.0 to 6.2.0 (#200) (#202) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v6.1.0...v6.2.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 8639c41) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add xacro as an exec_depend for blue_description (#215) (#219) Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit 506be06) Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu> * Style: Upcase "as" in Dockerfile (backport #214) (#217) * Fix case on "as" in Dockerfile (#214) Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit 8bbb19e) # Conflicts: # .docker/Dockerfile * Resolved merge conflicts * Bump build versions --------- Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu> Co-authored-by: Evan Palmer <evanp922@gmail.com> * Add "robot" container (backport #221) (#225) * Add "robot" container (#221) * Initial commit of _robot container and devcontainer * Add xacro as an exec_depend for blue_description * Update comments * Remove unused Docker stage "blue_src_and_deps" Renamed *.repos --> blue.repos and sim.repos --------- Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit ba77c25) # Conflicts: # blue.repos * Fixed merge conflict from mergify * Use "iron" branch of ros_gz --------- Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu> Co-authored-by: Evan Palmer <evanp922@gmail.com> Co-authored-by: Aaron Marburg <amarburg@uw.edu> * Use Gazebo Harmonic (#223) (#231) * Update to use Harmonic * Add "third-party" rosdep from OSRF for gazebo deps. * Added comment on "user ROOT" rather than sudo, joined two adjacent apt-get install steps. * Correct error in comment --------- Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit 8a4e05a) Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu> * Install ros_gz from binary package (iron, humble) (#228) * Install ros_gz from package, not from source, remove sim.repos * Removed additional apt-get lines from cherry-pick --------- Co-authored-by: Aaron Marburg <amarburg@uw.edu> * Install ros_gz from binary package (iron, humble) (#228) * Install ros_gz from package, not from source, remove sim.repos * Removed additional apt-get lines from cherry-pick --------- Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit 0e297bc) # Conflicts: # sim.repos --------- Co-authored-by: Evan Palmer <evanp922@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu> Co-authored-by: Aaron Marburg <amarburg@uw.edu>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes Made
Updates to using Gazebo Harmonic by default. Also includes:
Per the discussion in #170 this change should propagate successfully to all ROS versions. In the future, however, we may remove the manual build of
ros_gzfrom source and instead use binary packages forjazzy,ironandhumble.Associated Issues
Testing
Please provide a clear and concise description of the testing performed.
This is an automatic backport of pull request #223 done by [Mergify](https://mergify.com).