Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 8, 2024

Changes Made

Updates to using Gazebo Harmonic by default. Also includes:

  • Minor dependencies for Harmonic
  • ARG to specify Ardupilot / Ardusub version, however, it defaults to "master" (same as previous behavior)

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_gz from source and instead use binary packages for jazzy, iron and humble.

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).

* 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 <[email protected]>
(cherry picked from commit 8a4e05a)
@mergify mergify bot mentioned this pull request Aug 8, 2024
@evan-palmer evan-palmer self-assigned this Aug 8, 2024
@evan-palmer evan-palmer merged commit 5f7f740 into iron Aug 8, 2024
@evan-palmer evan-palmer deleted the mergify/bp/iron/pr-223 branch August 8, 2024 20:03
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 <[email protected]>

* Added additional resources for USB/IP tutorial (#196) (#198)

(cherry picked from commit 531ed83)

Co-authored-by: Evan Palmer <[email protected]>

* 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] <[email protected]>
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 <[email protected]>
(cherry picked from commit 506be06)

Co-authored-by: Aaron Marburg <[email protected]>

* Style: Upcase  "as" in Dockerfile (backport #214) (#217)

* Fix case on "as" in Dockerfile (#214)

Co-authored-by: Aaron Marburg <[email protected]>
(cherry picked from commit 8bbb19e)

# Conflicts:
#	.docker/Dockerfile

* Resolved merge conflicts

* Bump build versions

---------

Co-authored-by: Aaron Marburg <[email protected]>
Co-authored-by: Evan Palmer <[email protected]>

* 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 <[email protected]>
(cherry picked from commit ba77c25)

# Conflicts:
#	blue.repos

* Fixed merge conflict from mergify

* Use "iron" branch of ros_gz

---------

Co-authored-by: Aaron Marburg <[email protected]>
Co-authored-by: Evan Palmer <[email protected]>
Co-authored-by: Aaron Marburg <[email protected]>

* 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 <[email protected]>
(cherry picked from commit 8a4e05a)

Co-authored-by: Aaron Marburg <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
(cherry picked from commit 0e297bc)

# Conflicts:
#	sim.repos

---------

Co-authored-by: Evan Palmer <[email protected]>
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 <[email protected]>
Co-authored-by: Aaron Marburg <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants