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

[18632] Capture all fastcdr exceptions (backport #3528) #3542

Merged
merged 2 commits into from
Jun 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2023

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

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

You are currently cherry-picking commit f4000e854.
  (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:   src/cpp/dynamic-types/DynamicPubSubType.cpp
	modified:   src/cpp/fastdds/builtin/typelookup/common/TypeLookupTypes.cpp
	modified:   src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpression.cpp
	modified:   src/cpp/rtps/transport/tcp/TCPControlMessage.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/security/cryptography/AESGCMGMAC_Transform.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

* Refs #18001. Fixes on DDSFilterExpression.cpp

Signed-off-by: Miguel Company <[email protected]>

* Refs #18001. Fixes on TCPControlMessage.cpp

Signed-off-by: Miguel Company <[email protected]>

* Refs #18001. Changes in DynamicPubSubType.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18001. Changes in TypeLookupTypes.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18001. Changes in AESGCMGMAC_Transform.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18001. Uncrustify.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit f4000e8)

# Conflicts:
#	src/cpp/security/cryptography/AESGCMGMAC_Transform.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label May 26, 2023
@mergify mergify bot mentioned this pull request May 26, 2023
10 tasks
@MiguelCompany MiguelCompany added this to the v2.6.5 milestone May 30, 2023
@JLBuenoLopez
Copy link
Contributor

@MiguelCompany, can you look into the conflicts in this PR? Thanks!

Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-3528 branch from 28a5e2d to 5136cf5 Compare June 5, 2023 08:17
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jun 5, 2023
@MiguelCompany
Copy link
Member

@JLBuenoLopez-eProsima done!

@JLBuenoLopez JLBuenoLopez added the ci-pending PR which CI is running label Jun 6, 2023
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JLBuenoLopez JLBuenoLopez removed the ci-pending PR which CI is running label Jun 6, 2023
@JLBuenoLopez JLBuenoLopez merged commit 3fd92fb into 2.6.x Jun 6, 2023
@JLBuenoLopez JLBuenoLopez deleted the mergify/bp/2.6.x/pr-3528 branch June 6, 2023 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants