Skip to content

Merge part of 10 to 11#807

Merged
scpeters merged 9 commits intogazebosim:sdf11from
scpeters:merge_9_to_11
Dec 29, 2021
Merged

Merge part of 10 to 11#807
scpeters merged 9 commits intogazebosim:sdf11from
scpeters:merge_9_to_11

Conversation

@scpeters
Copy link
Copy Markdown
Member

➡️ Forward port

Port sdf10 as of 6b53f95 (#789) to sdf10. I'm forward-porting this separately from #780 to simplify that forward port.

Branch comparison: sdf11...6b53f95

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

iche033 and others added 8 commits November 8, 2021 12:00
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* Fix cmake warning about newlines
* Find python3 in cmake, fix warning (gazebosim#328)

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters scpeters requested a review from azeey as a code owner December 29, 2021 19:06
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Dec 29, 2021
Account for new behavior of nested models and :: syntax.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #807 (bff502f) into sdf11 (24a2782) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##            sdf11     #807   +/-   ##
=======================================
  Coverage   88.89%   88.89%           
=======================================
  Files          73       73           
  Lines       11072    11072           
=======================================
  Hits         9843     9843           
  Misses       1229     1229           

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 24a2782...bff502f. Read the comment docs.

@scpeters scpeters merged commit 5c6e870 into gazebosim:sdf11 Dec 29, 2021
@scpeters scpeters deleted the merge_9_to_11 branch December 29, 2021 19:53
@osrf-triage
Copy link
Copy Markdown

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-03-25-fortress-edifice-citadel/1343/1

@osrf-triage
Copy link
Copy Markdown

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏢 edifice Ignition Edifice

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants