Merge ign-sensors6 ➡️ main #247
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
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: AmrElsersy <[email protected]> Signed-off-by: Ashton Larkin <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Ashton Larkin <[email protected]> Co-authored-by: Ashton Larkin <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Jorge Perez <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
chapulina
added
the
needs upstream release
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
* ⬆️ 2.9.1 🏁 (#70) Signed-off-by: Louise Poubel <[email protected]> * Change IGN_DESIGNATION to GZ_DESIGNATION (#246) Signed-off-by: Nate Koenig <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Louise Poubel <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
chapulina
removed
the
needs upstream release
chapulina
force-pushed
the
chapulina/6_to_7
branch
from
a605f23 to
7a01d5d
Compare
chapulina
added a commit
that referenced
this pull request
Aug 2, 2022
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
chapulina
force-pushed
the
chapulina/6_to_7
branch
from
c52e9dd to
eab4514
Compare
|
The https://build.osrfoundation.org/job/ignition_sensors-ci-main-focal-amd64/25/ It may be due to Ogre 2.3, CC @mjcarroll @iche033 |
iche033
approved these changes
Aug 3, 2022
|
Thanks. I'll override the required checks to get this in and won't bother making them unrequired for now, it looks like @mjcarroll is working on a fix. |
jennuine
reviewed
Aug 3, 2022
| @@ -147,6 +147,15 @@ target_link_libraries(${thermal_camera_target} | |||
| gz-transport${GZ_TRANSPORT_VER}::gz-transport${GZ_TRANSPORT_VER} | |||
| ) | |||
|
|
|||
| set(boundingbox_camera_sources BoundingBoxCameraSensor.cc) | |||
| ign_add_component(boundingbox_camera SOURCES ${boundingbox_camera_sources} GET_TARGET_NAME boundingbox_camera_target) | |||
There was a problem hiding this comment.
Suggested change
| ign_add_component(boundingbox_camera SOURCES ${boundingbox_camera_sources} GET_TARGET_NAME boundingbox_camera_target) | |
| gz_add_component(boundingbox_camera SOURCES ${boundingbox_camera_sources} GET_TARGET_NAME boundingbox_camera_target) |
There was a problem hiding this comment.
Ahhhh nice catch, I'll open a new PR
There was a problem hiding this comment.
8 tasks
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.
➡️ Forward port
Port
ign-sensors6➡️mainBranch comparison: main...ign-sensors6
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)