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

ign -> gz CMake, Python, Partial Source, and File Migrations : gz-common #392

Merged
merged 2 commits into from
Jul 15, 2022

Conversation

methylDragon
Copy link
Contributor

@methylDragon
Copy link
Contributor Author

@osrf-jenkins run tests please!

1 similar comment
@methylDragon
Copy link
Contributor Author

@osrf-jenkins run tests please!

@methylDragon methylDragon force-pushed the ci_matching_branch/file_and_source_migration branch from 969d80c to a4ba4cf Compare July 12, 2022 20:58
@methylDragon
Copy link
Contributor Author

@osrf-jenkins run tests please!

1 similar comment
@methylDragon
Copy link
Contributor Author

@osrf-jenkins run tests please!

@chapulina chapulina added the ign to gz Renaming Ignition to Gazebo. label Jul 13, 2022
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

All the plugin stuff doesn't need to be migrated

src/PluginLoader.cc Outdated Show resolved Hide resolved
test/static_assertions/plugin_no_base_class.cc Outdated Show resolved Hide resolved
@methylDragon methylDragon force-pushed the ci_matching_branch/file_and_source_migration branch 3 times, most recently from 976588c to cece49d Compare July 13, 2022 21:06
methylDragon added a commit that referenced this pull request Jul 13, 2022
@methylDragon methylDragon force-pushed the ci_matching_branch/file_and_source_migration branch from cece49d to 6506cdf Compare July 13, 2022 21:23
methylDragon added a commit that referenced this pull request Jul 13, 2022
@methylDragon methylDragon force-pushed the ci_matching_branch/file_and_source_migration branch from 6506cdf to a186084 Compare July 13, 2022 23:21
methylDragon added a commit that referenced this pull request Jul 13, 2022
@methylDragon methylDragon force-pushed the ci_matching_branch/file_and_source_migration branch from a186084 to 71754e2 Compare July 13, 2022 23:22
Migration.md Outdated
@@ -75,7 +75,7 @@ release will remove the deprecated code.
### Modifications

1. Corrected `BAYER_RGGR8` to `BAYER_BGGR8` in `PixelFormatName` and
`PixelFormatType` located in `graphics/include/ignition/common/Image.hh`.
`PixelFormatType` located in `graphics/gz/common/Image.hh`.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
`PixelFormatType` located in `graphics/gz/common/Image.hh`.
`PixelFormatType` located in `graphics/include/gz/common/Image.hh`.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, fixed! 92a820c

@@ -41,7 +41,7 @@ if (UNIX)
PASS_REGULAR_EXPRESSION "is not a base class of")

set_tests_properties(STATIC_ASSERT_plugin_not_global_ns PROPERTIES
PASS_REGULAR_EXPRESSION "IGN_macro_must_be_used_in_global_namespace")
PASS_REGULAR_EXPRESSION "GZ_macro_must_be_used_in_global_namespace")
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is causing test failures:

  [100%] Building CXX object test/static_assertions/CMakeFiles/plugin_not_global_ns.dir/plugin_not_global_ns.cc.o
  In file included from /github/workspace/include/ignition/common/PluginMacros.hh:23,
                   from /github/workspace/test/static_assertions/plugin_not_global_ns.cc:22:
  /github/workspace/include/ignition/common/detail/PluginMacros.hh:71:9: [Censored by testrunner.bash]: '::IGN_macro_must_be_used_in_global_namespace' has not been declared; did you mean 'ns::IGN_macro_must_be_used_in_global_namespace'?
     71 |       ::IGN_macro_must_be_used_in_global_namespace>::value, \
        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed! 92a820c

@methylDragon methylDragon force-pushed the ci_matching_branch/file_and_source_migration branch from 71754e2 to 92a820c Compare July 15, 2022 00:37
@codecov
Copy link

codecov bot commented Jul 15, 2022

Codecov Report

Merging #392 (92a820c) into main (a714900) will decrease coverage by 0.02%.
The diff coverage is 50.00%.

@@            Coverage Diff             @@
##             main     #392      +/-   ##
==========================================
- Coverage   77.83%   77.81%   -0.03%     
==========================================
  Files          85       85              
  Lines       10771    10770       -1     
==========================================
- Hits         8384     8381       -3     
- Misses       2387     2389       +2     
Impacted Files Coverage Δ
av/src/VideoEncoder.cc 75.47% <ø> (ø)
...esting/include/gz/common/testing/BazelTestPaths.hh 0.00% <ø> (ø)
testing/src/BazelTestPaths.cc 0.00% <0.00%> (ø)
src/Console.cc 86.23% <50.00%> (ø)
graphics/src/Image.cc 73.02% <100.00%> (ø)
profiler/src/Profiler.cc 45.71% <100.00%> (ø)
src/SystemPaths.cc 78.68% <0.00%> (-1.17%) ⬇️

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 a714900...92a820c. Read the comment docs.

@methylDragon methylDragon enabled auto-merge (rebase) July 15, 2022 01:45
@methylDragon methylDragon merged commit 60db2b6 into main Jul 15, 2022
@methylDragon methylDragon deleted the ci_matching_branch/file_and_source_migration branch July 15, 2022 17:46
methylDragon added a commit that referenced this pull request Jul 15, 2022
luca-della-vedova pushed a commit that referenced this pull request Jul 27, 2022
luca-della-vedova pushed a commit that referenced this pull request Jul 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden ign to gz Renaming Ignition to Gazebo.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants