xacro is an exec_depend for blue_description #215
Merged
Conversation
This file contains 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
evan-palmer
approved these changes
Jul 26, 2024
evan-palmer
merged commit 506be06
into
Robotic-Decision-Making-Lab:main
3 checks passed
|
@mergify backport humble iron |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Jul 26, 2024
Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit 506be06)
mergify bot
pushed a commit
that referenced
this pull request
Jul 26, 2024
Co-authored-by: Aaron Marburg <amarburg@uw.edu> (cherry picked from commit 506be06)
This was referenced Jul 26, 2024
evan-palmer
pushed a commit
that referenced
this pull request
Jul 26, 2024
evan-palmer
pushed a commit
that referenced
this pull request
Jul 26, 2024
amarburg
added a commit
to apl-ocean-engineering/blue
that referenced
this pull request
Jul 30, 2024
…king-Lab#215) Co-authored-by: Aaron Marburg <amarburg@uw.edu>
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>
evan-palmer
added a commit
that referenced
this pull request
Aug 17, 2024
* Bump docker/login-action from 3.1.0 to 3.2.0 (#172) Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: docker/login-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> * Bump docker/build-push-action from 5.3.0 to 5.4.0 (#175) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5.3.0...v5.4.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> * Bump braces from 3.0.2 to 3.0.3 in /docs (#182) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump docker/build-push-action from 5.4.0 to 6.0.0 (#179) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.4.0 to 6.0.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5.4.0...v6.0.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump docker/build-push-action from 6.0.0 to 6.1.0 (#187) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v6.0.0...v6.1.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> * Resolved bug in BlueROV2 Heavy and Heavy Reach launch configurations (#193) * Fixed ardusub_gazebo install and mavros configurations * Remapped controller manager topic to robot state publisher topic * Added missing gstreamer dependency * Added additional resources for USB/IP tutorial (#196) * Bump docker/build-push-action from 6.1.0 to 6.2.0 (#200) 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> * Bump docker/build-push-action from 6.2.0 to 6.3.0 (#203) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.2.0 to 6.3.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v6.2.0...v6.3.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> * Bump docker/setup-qemu-action from 3.0.0 to 3.1.0 (#204) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-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> * Bump docker/setup-qemu-action from 3.1.0 to 3.2.0 (#205) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-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> * Bump docker/build-push-action from 6.3.0 to 6.5.0 (#206) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.3.0 to 6.5.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v6.3.0...v6.5.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> * Bump docker/login-action from 3.2.0 to 3.3.0 (#207) Bumps [docker/login-action](https://github.com/docker/login-action) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: docker/login-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> * Fix case on "as" in Dockerfile (#214) Co-authored-by: Aaron Marburg <amarburg@uw.edu> * Add xacro as an exec_depend for blue_description (#215) Co-authored-by: Aaron Marburg <amarburg@uw.edu> * 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> * Use Gazebo Harmonic (#223) * 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> * Rolling ROS image is now based on "noble" (#220) * Update to use Harmonic * Update main Dockerfile for "noble" base images: - Use the provided user "ubuntu" at UID 1000 - Use a venv for user-installed python packages * Add "third-party" rosdep from OSRF for gazebo deps. * Install cppzmq-dev for Gazebo * Allow pushing to apl-ocean-engineering * Build mavros from source. * Build mavros from source, with patch to fix yaml-cpp linkage * ardupilot script should not activate venv by default. Activate blue venv instead. * Reverse change in docker.yaml action. * Insert comment before arduplot additions to .bashrc * Update username in .devcontainer/ * Replace patches for mavros/mavlink with sed one-liners. * Extend Docker build timeout in github actions to allow for extended arm64 build times. * timeout_minutes should be at job level? * Disabled arm64 build for "robot" Also: * Set python in venv as default Python in dev container * Remove build timeout in github action (which was ignored) * Correctly disable arm64 build. --------- Co-authored-by: Aaron Marburg <amarburg@uw.edu> * Backport #220 into Jazzy * Removed testing image from nvidia-desktop compose script --------- Signed-off-by: dependabot[bot] <support@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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
For the "robot" configuration (without Gazebo, etc) I found "xacro" needed to be installed manually / was an undeclared dependency.
This PR adds it as an
<exec_depend>ofblue_descriptionto ensure it is installed by rosdep.Associated Issues
(none)
Testing
Test by CI.