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

3 to 4 #933

Merged
merged 14 commits into from
Jul 27, 2021
Merged

3 to 4 #933

merged 14 commits into from
Jul 27, 2021

Conversation

adlarkin
Copy link
Contributor

➡️ Forward port

Port ign-gazebo3 to ign-gazebo4

Branch comparison: ign-gazebo4...ign-gazebo3


I had to resolve a few merge conflicts. I believe that we will also need an ign-gui4 release in order to support #904, which is part of this forward-port.

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

chapulina and others added 13 commits July 15, 2021 10:47
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>

Co-authored-by: RafiAbdullah <rafi@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
Signed-off-by: Marcos Wagner <wagnermarcos@ekumenlabs.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>

Co-authored-by: Franco Cipollone <franco.c@ekumenlabs.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: addy1997 <adwaitnaik2@gmail.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>

Removed changes to diff-drive command when backporting to ign-gazebo3

Signed-off-by: Louise Poubel <louise@openrobotics.org>
Extend test to have two logical cameras observing the same box.

Signed-off-by: Jaldert Rombouts <jaldert@vicarious.com>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Added world exporter

Signed-off-by: Gonzalo de Pedro <gonzalo@depedro.com.ar>

* Fixed CMake

Signed-off-by: Gonzalo de Pedro <gonzalo@depedro.com.ar>

* Changes based on review

Signed-off-by: Gonzalo de Pedro <gonzalo@depedro.com.ar>

* Added example world

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* bump required ign-common version

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* PR updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update documentation to have simulation self terminate

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Rename world_export to collada_world_exporter

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Finish world exporter renaming

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Revert change

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added a tutorial

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update transform

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added message

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added a test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added more shapes

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Cleanup in two locations

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Apply scale, and fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
…ts. (#629)

Signed-off-by: Martin Pecka <peckama2@fel.cvut.cz>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@adlarkin adlarkin added the needs upstream release Blocked by a release of an upstream library label Jul 26, 2021
@adlarkin adlarkin requested a review from chapulina July 26, 2021 22:10
@github-actions github-actions bot added the 🔮 dome Ignition Dome label Jul 26, 2021
@chapulina chapulina mentioned this pull request Jul 27, 2021
7 tasks
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

LGTM when CI is happy

adlarkin added a commit that referenced this pull request Jul 27, 2021
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@codecov
Copy link

codecov bot commented Jul 27, 2021

Codecov Report

Merging #933 (65c01a7) into ign-gazebo4 (488cc87) will increase coverage by 0.28%.
The diff coverage is 89.94%.

❗ Current head 65c01a7 differs from pull request most recent head d76a6c2. Consider uploading reports for the commit d76a6c2 to get more accurate results
Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo4     #933      +/-   ##
===============================================
+ Coverage        65.98%   66.26%   +0.28%     
===============================================
  Files              239      240       +1     
  Lines            17686    17872     +186     
===============================================
+ Hits             11670    11843     +173     
- Misses            6016     6029      +13     
Impacted Files Coverage Δ
src/systems/diff_drive/DiffDrive.cc 85.90% <66.66%> (-0.67%) ⬇️
src/cmd/ModelCommandAPI.cc 90.17% <90.17%> (ø)
src/EntityComponentManager.cc 86.93% <100.00%> (+0.11%) ⬆️
src/gui/GuiRunner.cc 86.07% <100.00%> (+0.74%) ⬆️
src/ServerPrivate.cc 87.15% <0.00%> (+3.35%) ⬆️

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 488cc87...d76a6c2. Read the comment docs.

@adlarkin
Copy link
Contributor Author

It looks like macOS hasn't picked up on the new GUI release: https://build.osrfoundation.org/job/ignition_gazebo-ci-pr_any-homebrew-amd64/6141/consoleFull#18361520546ea37b8d-a6d4-40ae-8431-d90c018842af

However, the bottle has been built (I think): osrf/homebrew-simulation#1541

Is there a way to verify that macOS has picked up the new GUI release?

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@adlarkin
Copy link
Contributor Author

Now that the ign-gui release is out, I have updated CMakeLists.txt to require ign-gui 4.5.0.

@adlarkin
Copy link
Contributor Author

macOS is building now. The INTEGRATION_user_commands test failed again, but it has failed for the past 19 builds, so I don't think it's related to this PR. I'll go ahead and merge this.

@adlarkin adlarkin merged commit d76a6c2 into ign-gazebo4 Jul 27, 2021
@adlarkin adlarkin deleted the adlarkin/3_to_4 branch July 27, 2021 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔮 dome Ignition Dome needs upstream release Blocked by a release of an upstream library
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants