Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install ros_gz from binary package (iron, humble) (backport #228) #235

Merged
merged 11 commits into from
Aug 9, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 9, 2024

Changes Made

The PR is built on top of #223 and should only be merged once that PR has been merged and propagated to iron/humble. It depends on that PR to install the OSRF rosdep.yaml file.

Installs ros_gz from binary packages at packages.osrfoundation.org rather than building from source.

From the Gazebo documentation source packages should be available at OSRF for humble and iron.

A similar PR should be possible for Jazzy but I think the binary package provided by packages.ros.org has a slightly different name, and will make that a separate PR. Rolling will still require building from source.

This PR should be propagated to humble.

Associated Issues

Related to #170

Testing

"joy_teleop" demo works in Iron.


This is an automatic backport of pull request #228 done by Mergify.

evan-palmer and others added 10 commits June 24, 2024 20:39
…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>
(cherry picked from commit 531ed83)

Co-authored-by: Evan Palmer <evanp922@gmail.com>
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>
Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit 506be06)

Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu>
* 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 (#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>
* 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 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 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
Copy link
Author

mergify bot commented Aug 9, 2024

Cherry-pick of 0e297bc has failed:

On branch mergify/bp/humble/pr-228
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 0e297bc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .docker/Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: sim.repos

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@evan-palmer evan-palmer self-assigned this Aug 9, 2024
@evan-palmer evan-palmer merged commit 170ebce into humble Aug 9, 2024
7 checks passed
@evan-palmer evan-palmer deleted the mergify/bp/humble/pr-228 branch August 9, 2024 23:08
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