Skip to content

[19937] Update TLS unit test certificates (backport #4028) #4069

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 2 commits into from
Dec 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #4028 done by Mergify.
Cherry-pick of 2a867e0 has failed:

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

You are currently cherry-picking commit 2a867e062.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/config/asan_colcon.meta
	deleted by us:   .github/workflows/config/default_ci.meta
	deleted by us:   .github/workflows/config/nightly.meta
	deleted by us:   .github/workflows/config/tsan_colcon.meta
	deleted by us:   test/unittest/transport/certs/README.md
	deleted by us:   test/unittest/transport/certs/ca.crt
	deleted by us:   test/unittest/transport/certs/ca.key
	deleted by us:   test/unittest/transport/certs/fastdds.crt
	deleted by us:   test/unittest/transport/certs/fastdds.csr
	deleted by us:   test/unittest/transport/certs/fastdds.key

no changes added to commit (use "git add" and/or "git commit -a")

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 Nov 29, 2023
@mergify mergify bot mentioned this pull request Nov 29, 2023
6 tasks
@EduPonz EduPonz added this to the v2.6.7 milestone Nov 30, 2023
@MiguelCompany
Copy link
Member

Will work on conflicts after #3965 is merged

@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-4028 branch from fea603c to 945bd50 Compare December 4, 2023 10:58
@MiguelCompany MiguelCompany added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 4, 2023
MiguelCompany
MiguelCompany previously approved these changes Dec 4, 2023
@EduPonz EduPonz closed this Dec 4, 2023
@EduPonz EduPonz reopened this Dec 4, 2023
rsanchez15 and others added 2 commits December 5, 2023 07:47
* Refs #19937: Update TLS unit test certificates

Signed-off-by: EduPonz <[email protected]>

* Refs #19937: Enable TLS tests in all github CIs

Signed-off-by: EduPonz <[email protected]>

---------

Signed-off-by: EduPonz <[email protected]>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 2ae13ef into 2.6.x Dec 7, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4028 branch December 7, 2023 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants