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 gz-transport12 ➡️ main #434

Merged
merged 3 commits into from
Aug 30, 2023
Merged

Merge gz-transport12 ➡️ main #434

merged 3 commits into from
Aug 30, 2023

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Aug 29, 2023

➡️ Forward port

Port gz-transport12 ➡️ main

Branch comparison: main...gz-transport12

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

@azeey azeey requested a review from caguero as a code owner August 29, 2023 17:53
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Aug 29, 2023
@azeey
Copy link
Contributor Author

azeey commented Aug 29, 2023

The ParamCommand test is failing with

/home/jenkins/workspace/gz_transport-ci-pr_any-jammy-amd64/gz-transport/parameters/src/cmd/ParamCommandAPI_TEST.cc:103
Expected: (std::string::npos) != (output.find("gz_msgs.Boolean")), actual: 18446744073709551615 vs 18446744073709551615

I'll try changing to gz.msgs.Boolean. /cc @mjcarroll

Signed-off-by: Addisu Z. Taddese <[email protected]>
@@ -101,15 +101,19 @@ TEST_F(ParametersClientTest, cmdParameterGet)
cmdParameterGet("", "parameter1");
auto output = coutCapture.str();
EXPECT_NE(std::string::npos, output.find("gz_msgs.Boolean"));
EXPECT_EQ(cerrCapture.str(), "");
// TODO(azeey) Uncomment after
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are not part of the merge forward. They were needed to make tests pass. See #435

@azeey
Copy link
Contributor Author

azeey commented Aug 29, 2023

For some reason the Jammy Jenkins job wasn't started automatically. Build Status

@codecov
Copy link

codecov bot commented Aug 29, 2023

Codecov Report

Merging #434 (1300478) into main (d888517) will increase coverage by 0.04%.
Report is 3 commits behind head on main.
The diff coverage is 100.00%.

❗ Current head 1300478 differs from pull request most recent head 0f6392a. Consider uploading reports for the commit 0f6392a to get more accurate results

@@            Coverage Diff             @@
##             main     #434      +/-   ##
==========================================
+ Coverage   87.75%   87.79%   +0.04%     
==========================================
  Files          59       59              
  Lines        5693     5696       +3     
==========================================
+ Hits         4996     5001       +5     
+ Misses        697      695       -2     
Files Changed Coverage Δ
include/gz/transport/Discovery.hh 87.00% <100.00%> (+0.04%) ⬆️
python/src/transport/_gz_transport_pybind11.cc 75.00% <100.00%> (+0.15%) ⬆️

... and 1 file with indirect coverage changes

@iche033 iche033 merged commit b2877bc into gazebosim:main Aug 30, 2023
3 checks passed
@azeey azeey deleted the 12_to_main branch August 30, 2023 01:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants