Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 28, 2025

🦟 Bug fix

Fixes some tests using a cherry-pick from #2857

Summary

This cherry-picks 93f25a4 from #2857 to fix gz cmd test failures.

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 #2884 done by [Mergify](https://mergify.com).

Signed-off-by: Steve Peters <[email protected]>
(cherry picked from commit 3f40ef2)

# Conflicts:
#	src/cmd/CMakeLists.txt
@mergify
Copy link
Contributor Author

mergify bot commented Apr 28, 2025

Cherry-pick of 3f40ef2 has failed:

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

You are currently cherry-picking commit 3f40ef29.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cmd/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot requested a review from mjcarroll as a code owner April 28, 2025 17:31
@mergify mergify bot added the conflicts label Apr 28, 2025
@mergify mergify bot mentioned this pull request Apr 28, 2025
8 tasks
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Apr 28, 2025
@scpeters
Copy link
Member

easier to apply manually

@scpeters scpeters closed this Apr 28, 2025
@github-project-automation github-project-automation bot moved this from Inbox to Done in Core development Apr 28, 2025
@scpeters scpeters deleted the mergify/bp/gz-sim8/pr-2884 branch April 28, 2025 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants