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

Merge ign-gazebo3 ➡️ ign-gazebo6 #1481

Merged
merged 3 commits into from
May 16, 2022
Merged

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented May 12, 2022

➡️ Forward port

Port ign-gazebo3 ➡️ ign-gazebo6

Branch comparision: ign-gazebo6...ign-gazebo3

This is essentially a forward-port of #1456. On top of the features from Citadel, I added polyline collision visualization in 7225f38.

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina requested a review from quarkytale May 12, 2022 16:28
@chapulina chapulina added the MBARI buoy Sponsored by MBARI buoy sim project: https:/osrf/buoy_sim label May 12, 2022
@chapulina chapulina changed the title Merge ign-gazebo3 -> ign-gazebo6 Merge ign-gazebo3 ➡️ ign-gazebo6 May 12, 2022
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label May 12, 2022
@chapulina chapulina mentioned this pull request May 12, 2022
7 tasks
@codecov
Copy link

codecov bot commented May 13, 2022

Codecov Report

Merging #1481 (7225f38) into ign-gazebo6 (06381ea) will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff              @@
##           ign-gazebo6    #1481   +/-   ##
============================================
  Coverage        33.58%   33.58%           
============================================
  Files               44       44           
  Lines             2260     2260           
============================================
  Hits               759      759           
  Misses            1501     1501           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 06381ea...7225f38. Read the comment docs.

@chapulina
Copy link
Contributor Author

None of the test failures looks new to me.

Copy link
Contributor

@quarkytale quarkytale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me!

@chapulina chapulina enabled auto-merge May 16, 2022 17:59
@chapulina chapulina disabled auto-merge May 16, 2022 17:59
@chapulina chapulina merged commit bc8e5c1 into ign-gazebo6 May 16, 2022
@chapulina chapulina deleted the chapulina/3_to_6 branch May 16, 2022 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
MBARI buoy Sponsored by MBARI buoy sim project: https:/osrf/buoy_sim needs upstream release Blocked by a release of an upstream library
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants