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

[21470] Apply @Blast545 contribution: Add unsigned specification to literals (#5125) (backport #5149) #5174

Merged
merged 1 commit into from
Aug 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 26, 2024

Description

This PR is a mimic of

which is opened by an eProsima Team member in order to run internal CI.
No tests are needed, but just the library build.
This fix may also be needed in the 2.10.x Iron version, so it is marked as a backportable PR.

@Mergifyio backport 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • N/A If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5149 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Aug 26, 2024

Cherry-pick of daef938 has failed:

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

You are currently cherry-picking commit daef93808.
  (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 <file>..." to mark resolution)
	both modified:   include/fastdds/rtps/common/InstanceHandle.h

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Aug 26, 2024
@JesusPoderoso JesusPoderoso self-assigned this Aug 26, 2024
@JesusPoderoso JesusPoderoso added this to the v2.6.10 milestone Aug 26, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit daef938)
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Aug 26, 2024
@JesusPoderoso JesusPoderoso self-requested a review August 26, 2024 07:38
@github-actions github-actions bot added the ci-pending PR which CI is running label Aug 26, 2024
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Aug 26, 2024
@MiguelCompany MiguelCompany merged commit 4c460ef into 2.6.x Aug 26, 2024
15 of 17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-5149 branch August 26, 2024 09:47
@Blast545
Copy link

Thanks a lot! 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants