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) #4254

Merged
merged 2 commits into from
Jan 23, 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.11.x/pr-4248
Your branch is up to date with 'origin/2.11.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/fastdds/subscriber/history/DataReaderInstance.hpp
	modified:   src/cpp/rtps/DataSharing/WriterPool.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/reader/StatefulReader.cpp
	modified:   src/cpp/rtps/reader/StatelessReader.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/rtps/network/NetworkFactory.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.11.3 milestone Jan 17, 2024
* 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)

# Conflicts:
#	src/cpp/rtps/network/NetworkFactory.cpp
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 17, 2024
@EduPonz
Copy link

EduPonz commented Jan 18, 2024

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

CI issues unrelated to the PR. 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 18, 2024
@EduPonz EduPonz merged commit f67dc62 into 2.11.x Jan 23, 2024
9 of 13 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.11.x/pr-4248 branch January 23, 2024 08:14
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.

2 participants