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

Cherry-pick from sdf9 to sdf10 #372

Merged
merged 4 commits into from
Sep 10, 2020
Merged

Conversation

scpeters
Copy link
Member

@scpeters scpeters commented Sep 9, 2020

Cherry-pick #245, #368, #369, #361 to sdf10. Use rebase and merge.

I've created a branch that merged sdf9 -> sdf10 with resolved conflicts. Compare the diff to confirm that these changes are all that's missing from sdf10:

@scpeters
Copy link
Member Author

scpeters commented Sep 9, 2020

@chapulina why didn't this get any labels?

@scpeters
Copy link
Member Author

scpeters commented Sep 9, 2020

@chapulina why didn't this get any labels?

is it because I created the PR from my fork?

@scpeters scpeters added beta Targeting beta release of upcoming collection 🔮 dome Ignition Dome labels Sep 9, 2020
@scpeters
Copy link
Member Author

scpeters commented Sep 9, 2020

added labels manually

@codecov-commenter
Copy link

Codecov Report

Merging #372 into sdf10 will decrease coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##            sdf10     #372      +/-   ##
==========================================
- Coverage   87.36%   87.32%   -0.05%     
==========================================
  Files          60       60              
  Lines        9214     9214              
==========================================
- Hits         8050     8046       -4     
- Misses       1164     1168       +4     
Impacted Files Coverage Δ
src/Filesystem.cc 98.80% <ø> (ø)
src/Param.cc 92.05% <0.00%> (-1.33%) ⬇️

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 a71d22b...e190b60. Read the comment docs.

@scpeters scpeters merged commit be36f78 into gazebosim:sdf10 Sep 10, 2020
@scpeters scpeters deleted the pick_10_from_9.3.0 branch September 10, 2020 01:36
@chapulina
Copy link
Contributor

chapulina commented Sep 10, 2020

@chapulina why didn't this get any labels?
is it because I created the PR from my fork?

Yup, GitHub actions are really annoying with PRs from forks. But just last month they added a new feature that should fix. Here's an issue for tracking this: gazebo-tooling/pr-collection-labeler#4

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 🔮 dome Ignition Dome
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants