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 3 -> 6 (part 1) #527

Merged
merged 7 commits into from
Mar 27, 2023
Merged

Merge 3 -> 6 (part 1) #527

merged 7 commits into from
Mar 27, 2023

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port ign-gui3 as of 721eca0 to ign-gui6. This is a subset of the forward port attempted in #518 that appears to have stalled.

Branch comparison: ign-gui6...721eca0

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

chapulina and others added 7 commits August 17, 2022 13:27
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Signed-off-by: Louise Poubel <louise@openrobotics.org>
* Add degree as an optional unit for rotation in GzPose

Signed-off-by: youhy <haoyuan2019@outlook.com>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
This fixes the library path obtained by cmdgui.rb such that it points to
the .so file contained in the non-dev debian pack

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
@scpeters scpeters requested a review from jennuine as a code owner March 23, 2023 07:17
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Mar 23, 2023
@codecov
Copy link

codecov bot commented Mar 23, 2023

Codecov Report

Merging #527 (73e9daf) into ign-gui6 (8f415f3) will increase coverage by 1.72%.
The diff coverage is 100.00%.

❗ Current head 73e9daf differs from pull request most recent head f2dff76. Consider uploading reports for the commit f2dff76 to get more accurate results

@@             Coverage Diff              @@
##           ign-gui6     #527      +/-   ##
============================================
+ Coverage     68.10%   69.83%   +1.72%     
============================================
  Files            39       40       +1     
  Lines          5327     5324       -3     
============================================
+ Hits           3628     3718      +90     
+ Misses         1699     1606      -93     
Impacted Files Coverage Δ
src/plugins/image_display/ImageDisplay.cc 96.36% <ø> (+65.41%) ⬆️
src/Application.cc 86.52% <100.00%> (ø)
src/plugins/image_display/ImageDisplay.hh 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@scpeters
Copy link
Member Author

this has seg-faults in the 22.04 GitHub actions results (similar to #518 (comment)), but it does not have any 20.04 test failures.

cc @j-rivero

@scpeters scpeters merged commit 650d505 into ign-gui6 Mar 27, 2023
@scpeters scpeters deleted the scpeters/merge_3_6_part1 branch March 27, 2023 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants