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

Merge: 2 -> main #110

Merged
merged 12 commits into from
Sep 26, 2023
Merged

Merge: 2 -> main #110

merged 12 commits into from
Sep 26, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 26, 2023

➡️ Forward port

Port gz-utils2 to main

Branch comparison: main...gz-utils2

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

scpeters and others added 12 commits February 7, 2023 13:42
The LICENSE file contained a copy of the stanza
used at the top of source code files, while the
actual license was in the COPYING file. So remove
the stanza and put the actual Apache 2.0 license text
in LICENSE.

Similar to gazebosim/gz-math#521.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge ign-utils1 ➡️  gz-utils2
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Update documentation

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@iche033 iche033 requested a review from azeey as a code owner September 26, 2023 20:20
@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #110 (aac71df) into main (215e325) will decrease coverage by 12.52%.
The diff coverage is 70.61%.

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

@@             Coverage Diff             @@
##             main     #110       +/-   ##
===========================================
- Coverage   91.97%   79.45%   -12.52%     
===========================================
  Files           6        8        +2     
  Lines         137      331      +194     
===========================================
+ Hits          126      263      +137     
- Misses         11       68       +57     
Files Coverage Δ
include/gz/utils/Subprocess.hh 96.61% <96.61%> (ø)
include/gz/utils/detail/subprocess.h 59.25% <59.25%> (ø)

@mjcarroll
Copy link
Contributor

If possible, I have #105, #106, #107, and #108 ready to be reviewed that we could get in before this.

@iche033
Copy link
Contributor Author

iche033 commented Sep 26, 2023

ok yeah this can wait

@mjcarroll
Copy link
Contributor

Actually, CI looks good, we can also just do another forward port later.

@iche033
Copy link
Contributor Author

iche033 commented Sep 26, 2023

ok merging

@iche033 iche033 merged commit 94faf1e into main Sep 26, 2023
6 of 9 checks passed
@iche033 iche033 deleted the merge_2_main_20230926 branch September 26, 2023 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants