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

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

Merged
merged 1 commit into from
Dec 3, 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.10.x/pr-4028
Your branch is up to date with 'origin/2.10.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)

Changes to be committed:
	modified:   .github/workflows/asan/asan_colcon.meta
	modified:   test/unittest/transport/certs/README.md
	modified:   test/unittest/transport/certs/ca.crt
	modified:   test/unittest/transport/certs/ca.key
	modified:   test/unittest/transport/certs/fastdds.crt
	modified:   test/unittest/transport/certs/fastdds.csr
	modified:   test/unittest/transport/certs/fastdds.key

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	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

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.10.3 milestone Nov 30, 2023
@EduPonz EduPonz force-pushed the mergify/bp/2.10.x/pr-4028 branch from 6be8b0d to e14f9ed Compare November 30, 2023 06:41
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Nov 30, 2023
EduPonz
EduPonz previously approved these changes Nov 30, 2023
@EduPonz
Copy link

EduPonz commented Dec 2, 2023

@Mergifyio rebase

* Refs #19937: Update TLS unit test certificates

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

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

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 2a867e0)
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Copy link
Contributor Author

mergify bot commented Dec 2, 2023

rebase

✅ Branch has been successfully rebased

@EduPonz EduPonz force-pushed the mergify/bp/2.10.x/pr-4028 branch from 1f53249 to 42399c3 Compare December 2, 2023 20:10
@EduPonz
Copy link

EduPonz commented Dec 2, 2023

@richiprosima please test this

@EduPonz
Copy link

EduPonz commented Dec 3, 2023

@richiprosima please test mac

@EduPonz EduPonz merged commit e343b16 into 2.10.x Dec 3, 2023
@EduPonz EduPonz deleted the mergify/bp/2.10.x/pr-4028 branch December 3, 2023 19:48
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.

1 participant