Skip to content

[19546] Use FASTRTPS_NO_LIB on unittest root folder (backport #3856)#3873

Merged
MiguelCompany merged 2 commits into2.6.xfrom
mergify/bp/2.6.x/pr-3856
Nov 28, 2023
Merged

[19546] Use FASTRTPS_NO_LIB on unittest root folder (backport #3856)#3873
MiguelCompany merged 2 commits into2.6.xfrom
mergify/bp/2.6.x/pr-3856

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 21, 2023

This is an automatic backport of pull request #3856 done by Mergify.
Cherry-pick of e00b8e3 has failed:

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

You are currently cherry-picking commit e00b8e323.
  (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:   test/unittest/CMakeLists.txt
	modified:   test/unittest/dds/collections/CMakeLists.txt
	modified:   test/unittest/dds/core/condition/CMakeLists.txt
	modified:   test/unittest/dds/core/entity/CMakeLists.txt
	modified:   test/unittest/dds/participant/CMakeLists.txt
	modified:   test/unittest/dds/publisher/CMakeLists.txt
	modified:   test/unittest/dds/status/CMakeLists.txt
	modified:   test/unittest/dds/topic/CMakeLists.txt
	modified:   test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt
	modified:   test/unittest/dynamic_types/CMakeLists.txt
	modified:   test/unittest/logging/CMakeLists.txt
	modified:   test/unittest/rtps/DataSharing/CMakeLists.txt
	modified:   test/unittest/rtps/builtin/CMakeLists.txt
	modified:   test/unittest/rtps/discovery/CMakeLists.txt
	modified:   test/unittest/rtps/flowcontrol/CMakeLists.txt
	modified:   test/unittest/rtps/history/CMakeLists.txt
	modified:   test/unittest/rtps/persistence/CMakeLists.txt
	modified:   test/unittest/rtps/resources/timedevent/CMakeLists.txt
	modified:   test/unittest/rtps/security/CMakeLists.txt
	modified:   test/unittest/rtps/writer/CMakeLists.txt
	modified:   test/unittest/security/authentication/CMakeLists.txt
	modified:   test/unittest/security/cryptography/CMakeLists.txt
	modified:   test/unittest/security/logging/CMakeLists.txt
	modified:   test/unittest/statistics/rtps/CMakeLists.txt
	modified:   test/unittest/transport/CMakeLists.txt
	modified:   test/unittest/utils/CMakeLists.txt
	modified:   test/unittest/xmlparser/CMakeLists.txt
	modified:   test/unittest/xtypes/CMakeLists.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/dds/subscriber/CMakeLists.txt
	both modified:   test/unittest/logging/log_macros/CMakeLists.txt
	both modified:   test/unittest/rtps/common/CMakeLists.txt
	both modified:   test/unittest/rtps/network/CMakeLists.txt
	both modified:   test/unittest/rtps/reader/CMakeLists.txt
	both modified:   test/unittest/security/accesscontrol/CMakeLists.txt
	both modified:   test/unittest/statistics/dds/CMakeLists.txt

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

@MiguelCompany @mergify
Use FASTRTPS_NO_LIB on unittest root folder (#3856)
174a8cd 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit e00b8e3)

# Conflicts:
#	test/unittest/dds/subscriber/CMakeLists.txt
#	test/unittest/logging/log_macros/CMakeLists.txt
#	test/unittest/rtps/common/CMakeLists.txt
#	test/unittest/rtps/network/CMakeLists.txt
#	test/unittest/rtps/reader/CMakeLists.txt
#	test/unittest/security/accesscontrol/CMakeLists.txt
#	test/unittest/statistics/dds/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 21, 2023
@mergify mergify bot mentioned this pull request Sep 21, 2023
Merged
6 tasks
@JLBuenoLopez JLBuenoLopez added this to the v2.6.7 milestone Oct 3, 2023
@JesusPoderoso
Copy link
Copy Markdown
Contributor

JesusPoderoso commented Oct 20, 2023

Hi @MiguelCompany, could you please take a look at the conflicts?

@MiguelCompany
Fix conflicts
97adfcf 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-3856 branch from d0b9cfe to 97adfcf Compare October 26, 2023 11:12
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Oct 26, 2023
@MiguelCompany
Copy link
Copy Markdown
Member

MiguelCompany commented Oct 26, 2023

@richiprosima Please test this

@JLBuenoLopez JLBuenoLopez added ci-pending PR which CI is running needs-review PR that is ready to be reviewed labels Oct 26, 2023
@JLBuenoLopez
Copy link
Copy Markdown
Contributor

JLBuenoLopez commented Oct 27, 2023

@MiguelCompany Mac failures seem unrelated. Also, this PR needs a review.

@JLBuenoLopez JLBuenoLopez removed the ci-pending PR which CI is running label Oct 27, 2023
@MiguelCompany
Copy link
Copy Markdown
Member

MiguelCompany commented Oct 27, 2023

Also, this PR needs a review.

@EduPonz You reviewed the original PR. Would you mind reviewing this backport?

@JesusPoderoso
Copy link
Copy Markdown
Contributor

JesusPoderoso commented Nov 7, 2023

@EduPonz friendly ping

@EduPonz EduPonz removed the needs-review PR that is ready to be reviewed label Nov 28, 2023
@MiguelCompany MiguelCompany merged commit 9c56825 into 2.6.x Nov 28, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3856 branch November 28, 2023 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@EduPonz EduPonz EduPonz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.6.7

Development

Successfully merging this pull request may close these issues.

4 participants

@JesusPoderoso @MiguelCompany @JLBuenoLopez @EduPonz