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

macOS: use tinyxml1 formula (backport #4091) #4092

Merged
merged 1 commit into from
Jan 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

This is an automatic backport of pull request #4091 done by Mergify.
Cherry-pick of 7956a5e has failed:

On branch mergify/bp/humble/pr-4091
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 7956a5e4.
  (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:   source/Installation/Alternatives/macOS-Development-Setup.rst

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from clalancette as a code owner January 8, 2024 22:20
@mergify mergify bot added the conflicts label Jan 8, 2024
@mergify mergify bot requested a review from audrow as a code owner January 8, 2024 22:20
@mergify mergify bot mentioned this pull request Jan 8, 2024
The tinyxml formula is about to be deprecated,
so switch to an alternate tinyxml1 formula
hosted in the osrf/simulation tap.

Signed-off-by: Steve Peters <[email protected]>
(cherry picked from commit 7956a5e)
@clalancette clalancette merged commit a7cdbb4 into humble Jan 8, 2024
3 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-4091 branch January 8, 2024 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants