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

[20055] Fix build with TLS, but not security. (backport #4156) #4164

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2023

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

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

You are currently cherry-picking commit fae8f1e22.
  (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/blackbox/common/BlackboxTests.cpp
	modified:   test/blackbox/common/BlackboxTests.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/BlackboxTestsSecurity.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

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit fae8f1e)

# Conflicts:
#	test/blackbox/common/BlackboxTestsSecurity.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 18, 2023
@JesusPoderoso JesusPoderoso added the no-test Skip CI tests if PR marked with this label label Dec 18, 2023
@JesusPoderoso JesusPoderoso added this to the v2.6.7 milestone Dec 18, 2023
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Dec 18, 2023
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@MiguelCompany
Copy link
Member

Closing, will be included along with #4153

@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4156 branch December 18, 2023 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-test Skip CI tests if PR marked with this label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants