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.

Sign up for GitHub

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

Jump to bottom

Merge ign-gazebo3 ➡️ ign-gazebo6 #1547

Merged
merged 7 commits into from
Jun 23, 2022
Merged

Merge ign-gazebo3 ➡️ ign-gazebo6 #1547

merged 7 commits into from
Jun 23, 2022

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo3 ➡️ ign-gazebo6

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

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

chapulina and others added 5 commits June 3, 2022 08:48
@chapulina
🎈 3.13.0 (#1512)
4b643d2 
Signed-off-by: Louise Poubel <[email protected]>
@mabelzhang
Add new GZ_GUI_RESOURCE_PATH to help message (#1470)
5bb179f 
Signed-off-by: Louise Poubel <[email protected]>
@Blast545 @mjcarroll
Fix faulty assumption in INTEGRATION_log_system (#1426) (#1531)
900583a 
Signed-off-by: Michael Carroll <[email protected]>

Co-authored-by: Michael Carroll <[email protected]>
@mabelzhang @chapulina
Bash completion for flags (#1504)
dc5f117 
Signed-off-by: Mabel Zhang <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
@chapulina
3 ➡️ 6
dc5a777 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina added the 🏯 fortress Ignition Fortress label Jun 21, 2022
@chapulina chapulina mentioned this pull request Jun 21, 2022
Closed
mabelzhang
mabelzhang approved these changes Jun 21, 2022
View reviewed changes
Copy link
Contributor

@mabelzhang mabelzhang left a comment

Choose a reason for hiding this comment

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

Approving the bash completion part, which is the majority of this PR.
There's also a log system change which I don't have context for.

src/cmd/gazebo.bash_completion.sh Outdated Show resolved Hide resolved
@chapulina chapulina mentioned this pull request Jun 21, 2022
Merged
7 tasks
@codecov
Copy link

codecov bot commented Jun 22, 2022 •
edited
Loading

Codecov Report

Merging #1547 (9c60c16) into ign-gazebo6 (a74e926) will decrease coverage by 0.02%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           ign-gazebo6    #1547      +/-   ##
===============================================
- Coverage        64.00%   63.98%   -0.03%     
===============================================
  Files              317      317              
  Lines            25509    25509              
===============================================
- Hits             16327    16321       -6     
- Misses            9182     9188       +6
Impacted Files Coverage Δ
src/systems/log/LogRecord.cc 78.13% <0.00%> (-2.43%) ⬇️

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 a74e926...9c60c16. Read the comment docs.

@chapulina
Copy link
Contributor Author

Just a quick status update:

@chapulina chapulina merged commit e0388cf into ign-gazebo6 Jun 23, 2022
@chapulina chapulina deleted the chapulina/3_to_6 branch June 23, 2022 02:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mabelzhang mabelzhang mabelzhang approved these changes

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chapulina @mabelzhang @Blast545