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

[20255] Fix max clash with Windows CI (backport #4248) #4253

Merged
merged 1 commit into from
Jan 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2024

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


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

* Refs #20255: Fix max clash with Windows CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20255: Fix OpenSSL version to 3.1.1 in Windows CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20255: Uncrustify

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 9b31bc2)
@mergify mergify bot mentioned this pull request Jan 17, 2024
10 tasks
@EduPonz EduPonz added this to the v2.12.2 milestone Jan 17, 2024
@EduPonz EduPonz added the ci-pending PR which CI is running label Jan 17, 2024
@EduPonz
Copy link

EduPonz commented Jan 18, 2024

@richiprosima please test linux test mac

@JesusPoderoso
Copy link
Contributor

Unrelated CI issues. Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jan 22, 2024
@MiguelCompany MiguelCompany merged commit 432d620 into 2.12.x Jan 22, 2024
8 of 13 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.12.x/pr-4248 branch January 22, 2024 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants