-
Notifications
You must be signed in to change notification settings - Fork 817
[20255] Fix max clash with Windows CI (backport #4248) #4256
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
Conversation
* Refs #20255: Fix max clash with Windows CI Signed-off-by: EduPonz <[email protected]> * Refs #20255: Fix OpenSSL version to 3.1.1 in Windows CI Signed-off-by: EduPonz <[email protected]> * Refs #20255: Uncrustify Signed-off-by: EduPonz <[email protected]> --------- Signed-off-by: EduPonz <[email protected]> (cherry picked from commit 9b31bc2) # Conflicts: # src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp # src/cpp/rtps/DataSharing/WriterPool.hpp # src/cpp/rtps/network/NetworkFactory.cpp # src/cpp/rtps/reader/StatefulReader.cpp # src/cpp/rtps/reader/StatelessReader.cpp Signed-off-by: EduPonz <[email protected]>
Signed-off-by: EduPonz <[email protected]>
345f954
to
21dd9c0
Compare
@richiprosima please test this |
Signed-off-by: JesusPoderoso <[email protected]>
@richiprosima please test linux please test mac |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apart from the suggestion below we should also resolve the conflicts
Signed-off-by: JesusPoderoso <[email protected]>
@richiprosima please test mac |
1 similar comment
@richiprosima please test mac |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
This is an automatic backport of pull request #4248 done by Mergify.
Cherry-pick of 9b31bc2 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com