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: 13 -> main #454

Merged
merged 12 commits into from
Oct 11, 2023
Merged

Merge: 13 -> main #454

merged 12 commits into from
Oct 11, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 10, 2023

➡️ Forward port

Port gz-transport13 to main

Branch comparison: main...gz-transport13

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

Voldivh and others added 12 commits September 8, 2023 10:56
Signed-off-by: Voldivh <eloyabmfcv@gmail.com>
Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
* Fix Docker in Harmonic.
…d in gz-sim (#443)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
* Fix Harmonic links in the tutorials.

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
Signed-off-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>
@iche033 iche033 requested a review from caguero as a code owner October 10, 2023 19:05
@codecov
Copy link

codecov bot commented Oct 10, 2023

Codecov Report

Merging #454 (5b12bbe) into main (685ad65) will increase coverage by 0.42%.
Report is 20 commits behind head on main.
The diff coverage is 83.92%.

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

@@            Coverage Diff             @@
##             main     #454      +/-   ##
==========================================
+ Coverage   87.33%   87.76%   +0.42%     
==========================================
  Files          60       59       -1     
  Lines        5211     5696     +485     
==========================================
+ Hits         4551     4999     +448     
- Misses        660      697      +37     
Files Coverage Δ
include/gz/transport/Discovery.hh 87.00% <100.00%> (+3.36%) ⬆️
include/gz/transport/HandlerStorage.hh 100.00% <100.00%> (ø)
include/gz/transport/TopicStorage.hh 100.00% <100.00%> (ø)
log/src/Log.cc 79.45% <ø> (+1.48%) ⬆️
src/NetUtils.cc 75.22% <ø> (+3.26%) ⬆️
src/NodeOptions.cc 100.00% <ø> (+3.77%) ⬆️
src/NodeShared.cc 78.99% <100.00%> (+1.22%) ⬆️
src/cmd/gz.cc 95.20% <100.00%> (+0.59%) ⬆️
src/Publisher.cc 99.40% <94.11%> (-0.60%) ⬇️
src/Node.cc 91.12% <85.71%> (+0.31%) ⬆️
... and 1 more

... and 26 files with indirect coverage changes

@azeey
Copy link
Contributor

azeey commented Oct 10, 2023

Not sure why the Jammy job didn't run. I've triggered it manually:
Build Status

@j-rivero
Copy link
Contributor

@osrf-jenkins run tests

@iche033
Copy link
Contributor Author

iche033 commented Oct 11, 2023

CI looks good now. Merging.

@iche033 iche033 merged commit 95f1d76 into main Oct 11, 2023
14 of 15 checks passed
@iche033 iche033 deleted the merge_13_main_20231010 branch October 11, 2023 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants