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

Bazel updates for garden #513

Merged
merged 13 commits into from
Jan 31, 2024
Merged

Bazel updates for garden #513

merged 13 commits into from
Jan 31, 2024

Conversation

mjcarroll
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the 🌱 garden Ignition Garden label May 24, 2023
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label May 24, 2023
@azeey azeey added the beta Targeting beta release of upcoming collection label Jul 31, 2023
@azeey azeey removed the 🎵 harmonic Gazebo Harmonic label Aug 26, 2023
@mjcarroll mjcarroll removed the beta Targeting beta release of upcoming collection label Aug 28, 2023
@mjcarroll mjcarroll self-assigned this Oct 4, 2023
Copy link

codecov bot commented Jan 8, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (8e1aca6) 78.52% compared to head (86be1e8) 78.68%.

Files Patch % Lines
src/InstallationDirectories.cc 0.00% 1 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           gz-physics6     #513      +/-   ##
===============================================
+ Coverage        78.52%   78.68%   +0.15%     
===============================================
  Files              140      140              
  Lines             7670     7655      -15     
===============================================
  Hits              6023     6023              
+ Misses            1647     1632      -15     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mjcarroll and others added 8 commits January 9, 2024 14:16
Signed-off-by: Michael Carroll <[email protected]>

Update for upstream

Signed-off-by: Michael Carroll <[email protected]>

Fix test includes

Signed-off-by: Michael Carroll <[email protected]>

Fix install directory

Signed-off-by: Michael Carroll <[email protected]>

Fix installation directories

Signed-off-by: Michael Carroll <[email protected]>

Set resource paths

Signed-off-by: Michael Carroll <[email protected]>

Remaining test refactor

Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll mjcarroll force-pushed the mjcarroll/garden_bazel branch from ad7d7a4 to 19c4d52 Compare January 9, 2024 16:46
@mjcarroll mjcarroll mentioned this pull request Jan 9, 2024
This cleans up physics tests in a few ways:

Consolidate TestUtilities.hh and test/Utils.hh
Move test headers to test/include/test
Move mock headers to test/include/mock
Create an INTERFACE library for test/mock headers that sets common compiler definitions as well as common libraries to link against
Remove all instances of hardcoded world names or resource names and instead use constants.

Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll mjcarroll changed the base branch from gz-physics6 to mjcarroll/test_cleanup January 9, 2024 18:01
Base automatically changed from mjcarroll/test_cleanup to gz-physics6 January 30, 2024 15:21
Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

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

looks good to me. Built fine and tests passed with the garden branch in gz-bazel. Not sure why the abi checker job is failing.

@mjcarroll
Copy link
Contributor Author

Not sure why the abi checker job is failing

It's because I had this targeted to the test_cleanup branch initially, it's a checker problem.

@mjcarroll
Copy link
Contributor Author

@osrf-jenkins retest this please

@mjcarroll mjcarroll merged commit 1016539 into gz-physics6 Jan 31, 2024
9 of 11 checks passed
@mjcarroll mjcarroll deleted the mjcarroll/garden_bazel branch January 31, 2024 14:37
@@ -27,6 +27,7 @@

#define GZ_PHYSICS_VERSION "${PROJECT_VERSION}"
#define GZ_PHYSICS_VERSION_FULL "${PROJECT_VERSION_FULL}"
#define GZ_PHYSICS_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}
Copy link
Member

Choose a reason for hiding this comment

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

per gazebosim/gz-cmake#412, this breaks ABI

it looks like this PR was merged even with a broken ABI build

mjcarroll added a commit that referenced this pull request Feb 6, 2024
mjcarroll added a commit that referenced this pull request Feb 6, 2024
This reverts commit 1016539.

Signed-off-by: Michael Carroll <[email protected]>
scpeters pushed a commit that referenced this pull request Feb 6, 2024
This reverts commit 1016539.

Signed-off-by: Michael Carroll <[email protected]>
mjcarroll added a commit that referenced this pull request Feb 6, 2024
Signed-off-by: Michael Carroll <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants