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

Reduce example names to be able to run Conda CI on Windows (backport #476 to gz-cmake3) #484

Merged
merged 1 commit into from
Mar 13, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 11, 2025

🦟 Bug fix

Fixes the compilation on Windows.

Summary

Port of #463

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.


This is an automatic backport of pull request #476 done by Mergify.

@mergify mergify bot added the conflicts label Mar 11, 2025
@mergify mergify bot requested review from j-rivero and scpeters as code owners March 11, 2025 17:51
Copy link
Contributor Author

mergify bot commented Mar 11, 2025

Cherry-pick of 1c5630a has failed:

On branch mergify/bp/gz-cmake3/pr-476
Your branch is up to date with 'origin/gz-cmake3'.

You are currently cherry-picking commit 1c5630a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	renamed:    examples/core_child/README.md -> examples/c_child/README.md
	renamed:    examples/core_child/include/CMakeLists.txt -> examples/c_child/include/CMakeLists.txt
	renamed:    examples/core_child/src/CMakeLists.txt -> examples/c_child/src/CMakeLists.txt
	renamed:    examples/core_child/src/empty.cc -> examples/c_child/src/empty.cc
	renamed:    examples/core_child/test/CMakeLists.txt -> examples/c_child/test/CMakeLists.txt
	renamed:    examples/core_child_private/README.md -> examples/c_child_private/README.md
	renamed:    examples/core_child_private/include/CMakeLists.txt -> examples/c_child_private/include/CMakeLists.txt
	renamed:    examples/core_child_private/src/CMakeLists.txt -> examples/c_child_private/src/CMakeLists.txt
	renamed:    examples/core_child_private/src/empty.cc -> examples/c_child_private/src/empty.cc
	renamed:    examples/core_child_private/test/CMakeLists.txt -> examples/c_child_private/test/CMakeLists.txt
	renamed:    examples/core_nodep/README.md -> examples/c_nodep/README.md
	renamed:    examples/core_nodep/include/CMakeLists.txt -> examples/c_nodep/include/CMakeLists.txt
	renamed:    examples/core_nodep/src/AlmostEmpty.cc -> examples/c_nodep/src/AlmostEmpty.cc
	renamed:    examples/core_nodep_static/src/CMakeLists.txt -> examples/c_nodep/src/CMakeLists.txt
	renamed:    examples/core_nodep/test/CMakeLists.txt -> examples/c_nodep/test/CMakeLists.txt
	renamed:    examples/core_nodep_static/README.md -> examples/c_nodep_static/README.md
	renamed:    examples/core_nodep_static/include/CMakeLists.txt -> examples/c_nodep_static/include/CMakeLists.txt
	renamed:    examples/core_nodep_static/src/AlmostEmpty.cc -> examples/c_nodep_static/src/AlmostEmpty.cc
	renamed:    examples/core_nodep/src/CMakeLists.txt -> examples/c_nodep_static/src/CMakeLists.txt
	renamed:    examples/core_nodep_static/test/CMakeLists.txt -> examples/c_nodep_static/test/CMakeLists.txt
	renamed:    examples/core_static_child/README.md -> examples/c_static_child/README.md
	renamed:    examples/core_static_child/include/CMakeLists.txt -> examples/c_static_child/include/CMakeLists.txt
	renamed:    examples/use_component_depsA/src/CMakeLists.txt -> examples/c_static_child/src/CMakeLists.txt
	renamed:    examples/core_static_child/src/empty.cc -> examples/c_static_child/src/empty.cc
	renamed:    examples/core_static_child/test/CMakeLists.txt -> examples/c_static_child/test/CMakeLists.txt
	modified:   examples/comp_deps/README.md
	modified:   examples/comp_deps/src/AlmostEmpty.cc
	new file:   examples/comp_depsA/README.md
	renamed:    examples/use_component_depsB/src/CMakeLists.txt -> examples/comp_depsA/src/CMakeLists.txt
	renamed:    examples/use_component_depsA/src/empty.cc -> examples/comp_depsA/src/empty.cc
	new file:   examples/comp_depsB/README.md
	renamed:    examples/use_component_depsC/src/CMakeLists.txt -> examples/comp_depsB/src/CMakeLists.txt
	renamed:    examples/use_component_depsB/src/empty.cc -> examples/comp_depsB/src/empty.cc
	new file:   examples/comp_depsC/README.md
	new file:   examples/comp_depsC/src/CMakeLists.txt
	renamed:    examples/use_component_depsC/src/empty.cc -> examples/comp_depsC/src/empty.cc
	renamed:    examples/use_config_ifp/CMakeLists.txt -> examples/config_ifp/CMakeLists.txt
	new file:   examples/config_ifp/Findgz-find_config.cmake
	renamed:    examples/use_config_ifp/README.md -> examples/config_ifp/README.md
	new file:   examples/config_ifp/gz-find_configConfig.cmake
	renamed:    examples/use_config_ifp/src/CMakeLists.txt -> examples/config_ifp/src/CMakeLists.txt
	deleted:    examples/core_child/CMakeLists.txt
	deleted:    examples/core_child_private/CMakeLists.txt
	deleted:    examples/core_nodep/CMakeLists.txt
	deleted:    examples/core_nodep_static/CMakeLists.txt
	deleted:    examples/core_static_child/CMakeLists.txt
	deleted:    examples/core_static_child/src/CMakeLists.txt
	new file:   examples/test_c_child_requires_c_no_deps.bash
	deleted:    examples/test_core_child_requires_core_no_deps.bash
	deleted:    examples/use_component_depsA/CMakeLists.txt
	deleted:    examples/use_component_depsA/README.md
	deleted:    examples/use_component_depsB/CMakeLists.txt
	deleted:    examples/use_component_depsB/README.md
	deleted:    examples/use_component_depsC/CMakeLists.txt
	deleted:    examples/use_component_depsC/README.md
	deleted:    examples/use_config_ifp/Findgz-find_config.cmake
	deleted:    examples/use_config_ifp/gz-find_configConfig.cmake

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   examples/CMakeLists.txt
	both modified:   examples/c_child/CMakeLists.txt
	both modified:   examples/c_child_private/CMakeLists.txt
	both modified:   examples/c_nodep/CMakeLists.txt
	both modified:   examples/c_nodep_static/CMakeLists.txt
	both modified:   examples/c_static_child/CMakeLists.txt
	both modified:   examples/comp_deps/CMakeLists.txt
	both modified:   examples/comp_depsA/CMakeLists.txt
	both modified:   examples/comp_depsB/CMakeLists.txt
	both modified:   examples/comp_depsC/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

#476)

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
(cherry picked from commit 1c5630a)
@scpeters scpeters force-pushed the mergify/bp/gz-cmake3/pr-476 branch from 10a04bc to e4d0aa7 Compare March 11, 2025 20:49
@scpeters scpeters changed the title Reduce example names to be able to run Conda CI on Windows (gz-cmake4) (backport #476) Reduce example names to be able to run Conda CI on Windows (backport #476 to gz-cmake3) Mar 11, 2025
@j-rivero j-rivero merged commit e3cbf8d into gz-cmake3 Mar 13, 2025
10 checks passed
@j-rivero j-rivero deleted the mergify/bp/gz-cmake3/pr-476 branch March 13, 2025 20:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants