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

[20542] Fix input branch on reusable windows CI (backport #4539) #4544

Merged
merged 2 commits into from
Mar 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 9, 2024

This is an automatic backport of pull request #4539 done by Mergify.
Cherry-pick of a97e7ab has failed:

On branch mergify/bp/2.10.x/pr-4539
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit a97e7ab7d.
  (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:
	modified:   .github/workflows/reusable-windows-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ubuntu-ci.yml

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 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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit a97e7ab)

# Conflicts:
#	.github/workflows/ubuntu-ci.yml
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 9, 2024
Copy link
Contributor Author

mergify bot commented Mar 9, 2024

Cherry-pick of a97e7ab has failed:

On branch mergify/bp/2.10.x/pr-4539
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit a97e7ab7d.
  (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:
	modified:   .github/workflows/reusable-windows-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ubuntu-ci.yml

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

@MiguelCompany MiguelCompany added this to the v2.10.4 milestone Mar 11, 2024
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Mar 11, 2024
@MiguelCompany MiguelCompany merged commit ecec7a0 into 2.10.x Mar 11, 2024
8 of 11 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4539 branch March 11, 2024 07:12
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