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

[20176] Downgrade cmake version (backport #4218) #4232

Merged
merged 2 commits into from
Jan 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2024

This is an automatic backport of pull request #4218 done by Mergify.
Cherry-pick of 69b3e6a has failed:

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

You are currently cherry-picking commit 69b3e6ac5.
  (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:   CMakeLists.txt
	modified:   examples/cpp/dds/AdvancedConfigurationExample/CMakeLists.txt
	modified:   examples/cpp/dds/BasicConfigurationExample/CMakeLists.txt
	modified:   examples/cpp/dds/Configurability/CMakeLists.txt
	modified:   examples/cpp/dds/ContentFilteredTopicExample/CMakeLists.txt
	modified:   examples/cpp/dds/CustomListenerExample/CMakeLists.txt
	modified:   examples/cpp/dds/CustomPayloadPoolExample/CMakeLists.txt
	modified:   examples/cpp/dds/DeadlineQoSExample/CMakeLists.txt
	modified:   examples/cpp/dds/DisablePositiveACKs/CMakeLists.txt
	modified:   examples/cpp/dds/DiscoveryServerExample/CMakeLists.txt
	modified:   examples/cpp/dds/DynamicHelloWorldExample/CMakeLists.txt
	modified:   examples/cpp/dds/Filtering/CMakeLists.txt
	modified:   examples/cpp/dds/FlowControlExample/CMakeLists.txt
	modified:   examples/cpp/dds/HelloWorldExample/CMakeLists.txt
	modified:   examples/cpp/dds/HelloWorldExampleDataSharing/CMakeLists.txt
	modified:   examples/cpp/dds/HelloWorldExampleSharedMem/CMakeLists.txt
	modified:   examples/cpp/dds/HelloWorldExampleTCP/CMakeLists.txt
	modified:   examples/cpp/dds/HistoryKind/CMakeLists.txt
	modified:   examples/cpp/dds/Keys/CMakeLists.txt
	modified:   examples/cpp/dds/LateJoiners/CMakeLists.txt
	modified:   examples/cpp/dds/LifespanQoSExample/CMakeLists.txt
	modified:   examples/cpp/dds/LivelinessQoS/CMakeLists.txt
	modified:   examples/cpp/dds/OwnershipStrengthQoSExample/CMakeLists.txt
	modified:   examples/cpp/dds/RequestReplyExample/CMakeLists.txt
	modified:   examples/cpp/dds/SampleConfig_Controller/CMakeLists.txt
	modified:   examples/cpp/dds/SampleConfig_Events/CMakeLists.txt
	modified:   examples/cpp/dds/SampleConfig_Multimedia/CMakeLists.txt
	modified:   examples/cpp/dds/SecureHelloWorldExample/CMakeLists.txt
	modified:   examples/cpp/dds/StaticHelloWorldExample/CMakeLists.txt
	modified:   examples/cpp/dds/TypeLookupService/CMakeLists.txt
	modified:   examples/cpp/dds/WriterLoansExample/CMakeLists.txt
	modified:   examples/cpp/dds/ZeroCopyExample/CMakeLists.txt
	modified:   examples/cpp/rtps/AsSocket/CMakeLists.txt
	modified:   examples/cpp/rtps/Persistent/CMakeLists.txt
	modified:   examples/cpp/rtps/Registered/CMakeLists.txt
	modified:   fuzz/C++/fuzz_XMLProfiles/CMakeLists.txt
	modified:   fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt
	modified:   test/CMakeLists.txt
	modified:   test/profiling/allocations/CMakeLists.txt
	modified:   test/unittest/cmake/force_cxx/CMakeLists.txt
	modified:   thirdparty/optionparser/CMakeLists.txt
	modified:   tools/fds/CMakeLists.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   cmake/testing/GoogleTest.cmake

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 11, 2024
@mergify mergify bot mentioned this pull request Jan 11, 2024
9 tasks
@JesusPoderoso JesusPoderoso added this to the v2.12.2 milestone Jan 11, 2024
@JesusPoderoso JesusPoderoso added the skip-ci Automatically pass CI label Jan 11, 2024
JesusPoderoso and others added 2 commits January 11, 2024 09:51
* Refs #20176: downgrade cmake version

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20176: Require CMake minimum version 3.22 only for tests

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20176: Move test requirement to common function

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20176: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 69b3e6a)
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Jan 11, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@EduPonz EduPonz merged commit cead422 into 2.12.x Jan 12, 2024
12 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.12.x/pr-4218 branch January 12, 2024 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-ci Automatically pass CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants