Skip to content

[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

Merged
merged 4 commits into from
Feb 21, 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.
Cherry-pick of 9b31bc2 has failed:

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

You are currently cherry-picking commit 9b31bc25f.
  (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
	modified:   include/fastdds/rtps/messages/CDRMessage.hpp
	modified:   include/fastdds/rtps/security/logging/Logging.h
	modified:   include/fastrtps/utils/fixed_size_bitmap.hpp
	modified:   src/cpp/rtps/builtin/liveliness/WLP.cpp
	modified:   src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
	modified:   src/cpp/rtps/history/CacheChangePool.cpp
	modified:   src/cpp/rtps/history/TopicPayloadPool.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/security/logging/Logging.cpp
	modified:   src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp
	modified:   src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp
	modified:   src/cpp/security/cryptography/AESGCMGMAC_Types.h
	modified:   test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp
	modified:   test/unittest/utils/BitmapRangeTests.cpp
	modified:   test/unittest/xmlparser/XMLProfileParserTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp
	both modified:   src/cpp/rtps/DataSharing/WriterPool.hpp
	both modified:   src/cpp/rtps/network/NetworkFactory.cpp
	both modified:   src/cpp/rtps/reader/StatefulReader.cpp
	both modified:   src/cpp/rtps/reader/StatelessReader.cpp

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 added the conflicts Backport PR wich git cherry pick failed label Jan 17, 2024
@mergify mergify bot mentioned this pull request Jan 17, 2024
10 tasks
@EduPonz EduPonz added this to the v2.6.8 milestone Jan 17, 2024
* 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]>
@EduPonz EduPonz force-pushed the mergify/bp/2.6.x/pr-4248 branch from 345f954 to 21dd9c0 Compare January 17, 2024 11:41
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 17, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

Signed-off-by: JesusPoderoso <[email protected]>
@JesusPoderoso JesusPoderoso added the no-test Skip CI tests if PR marked with this label label Jan 24, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test linux please test mac

Copy link
Member

@Mario-DL Mario-DL left a 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

@Mario-DL
Copy link
Member

@richiprosima please test mac

1 similar comment
@Mario-DL
Copy link
Member

@richiprosima please test mac

@Mario-DL Mario-DL 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 Feb 21, 2024
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@EduPonz EduPonz merged commit dda3a02 into 2.6.x Feb 21, 2024
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4248 branch February 21, 2024 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
first-to-merge no-test Skip CI tests if PR marked with this label 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