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

11 ➡️ 12 #613

Merged
merged 5 commits into from
Jun 30, 2021
Merged

11 ➡️ 12 #613

merged 5 commits into from
Jun 30, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port sdf11 to main

Branch comparison: main...sdf11

The ABI fix is needed to unblock an ign-gazebo forward-port: gazebosim/gz-sim#888

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

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

chapulina and others added 4 commits June 28, 2021 19:45
@chapulina
Add triage, remove ticket templates (#608)
3b7ecc0 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@azeey
Fix ABI break on sdf11 (#606)
a4a71bc 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@chapulina @scpeters
🎈 11.2.1 (#609)
6034739 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@aaronchongth
Fix segfault when checking for required elements in joint (#610)
a9c928d 
* Used xml instead of elemXml, added test for this particular case

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jun 30, 2021
@chapulina
11 ➡️ 12 (#613)
9f4f008 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina force-pushed the chapulina/11_to_12 branch from 85b9ce2 to 9f4f008 Compare June 30, 2021 13:42
@chapulina chapulina enabled auto-merge June 30, 2021 13:46
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (main@0134e4d). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 2be745e differs from pull request most recent head 9f4f008. Consider uploading reports for the commit 9f4f008 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##             main     #613   +/-   ##
=======================================
  Coverage        ?   87.62%           
=======================================
  Files           ?       72           
  Lines           ?    10534           
  Branches        ?        0           
=======================================
  Hits            ?     9230           
  Misses          ?     1304           
  Partials        ?        0

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 0134e4d...9f4f008. Read the comment docs.

@chapulina chapulina disabled auto-merge June 30, 2021 16:34
@chapulina chapulina merged commit d8f8415 into main Jun 30, 2021
@chapulina chapulina deleted the chapulina/11_to_12 branch June 30, 2021 16:35
@scpeters scpeters mentioned this pull request Jul 13, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@azeey azeey azeey approved these changes

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@chapulina @codecov-commenter @azeey @ahcorde @aaronchongth