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

Forward port 6 to 7 #2019

Merged
merged 16 commits into from
Aug 2, 2023
Merged

Forward port 6 to 7 #2019

merged 16 commits into from
Aug 2, 2023

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Jun 16, 2023

➡️ Forward port

Port ign-gazebo6 to gz-sim7

Branch comparison: gz-sim7...ign-gazebo6

I think there might be some files in include/ignition/gazebo that should be removed.

Also, I would like to get #2011 in before this pr.

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

methylDragon and others added 15 commits April 13, 2023 13:32
* Migrate headers

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Add redirection headers

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Migrate include statements

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Generate MOC files from gz headers

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

* Migrate msgs include usage

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Add plugin aliases

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Fix tests and code check

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

* Added fuel.gazebosim.org test dir

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

* Fix SdfGenerator_TEST

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

* require rendering 3.7

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

* Fix namespaces

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

* Clarify messages

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* More debugging

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Fix linter

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* More testing

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* More debug

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* fix build

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* More debug

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* linter

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Fix build

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Fix build

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* More debug

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* More testing

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* More tests

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Fix gui.config

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

* Remove debugging

Signed-off-by: Nate Koenig <natekoenig@gmail.com>

---------

Signed-off-by: methylDragon <methylDragon@gmail.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Not all of the needed include paths are exported with
the gz-sim target, so including the gz/sim.hh header
doesn't work easily. This test fails to build and
illustrates the problem.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Needed since the auto-generated header is gz/gazebo.hh

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Fixes macOS build.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Jun 16, 2023
@osrf-triage osrf-triage added this to Inbox in Core development Jun 16, 2023
@nkoenig nkoenig changed the title Nkoenig/6 to 7 06052023 Forward port 6 to 7 Jun 16, 2023
Signed-off-by: Nate Koenig <natekoenig@gmail.com>
@codecov
Copy link

codecov bot commented Jun 21, 2023

Codecov Report

Merging #2019 (b0ddc34) into gz-sim7 (3bde4b5) will increase coverage by 0.03%.
The diff coverage is 95.45%.

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

@@             Coverage Diff             @@
##           gz-sim7    #2019      +/-   ##
===========================================
+ Coverage    64.98%   65.01%   +0.03%     
===========================================
  Files          353      353              
  Lines        28600    28618      +18     
===========================================
+ Hits         18585    18606      +21     
+ Misses       10015    10012       -3     
Impacted Files Coverage Δ
include/gz/sim/ServerConfig.hh 100.00% <ø> (ø)
include/gz/sim/rendering/MarkerManager.hh 100.00% <ø> (ø)
src/LevelManager.cc 89.39% <94.11%> (+0.20%) ⬆️
src/systems/physics/Physics.cc 67.35% <100.00%> (+0.22%) ⬆️
.../systems/triggered_publisher/TriggeredPublisher.cc 84.12% <100.00%> (+0.79%) ⬆️

... and 1 file with indirect coverage changes

@azeey azeey moved this from Inbox to In review in Core development Jun 26, 2023
@mjcarroll
Copy link
Contributor

@osrf-jenkins retest this please

@azeey azeey added the beta Targeting beta release of upcoming collection label Jul 31, 2023
@mjcarroll
Copy link
Contributor

@osrf-jenkins retest this please

@nkoenig nkoenig merged commit 44fbf79 into gz-sim7 Aug 2, 2023
9 of 12 checks passed
@nkoenig nkoenig deleted the nkoenig/6-to-7-06052023 branch August 2, 2023 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

6 participants