Skip to content

[13740] Add afunction that checks for repeated -I paths (issue #78) (backport #429)#430

Merged
EugenioCollado merged 2 commits into3.3.xfrom
mergify/bp/3.3.x/pr-429
Jan 16, 2025
Merged

[13740] Add afunction that checks for repeated -I paths (issue #78) (backport #429)#430
EugenioCollado merged 2 commits into3.3.xfrom
mergify/bp/3.3.x/pr-429

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 10, 2025

Description

Added a function that checks if the paths included with the -I function have already been added, and skips them if so. This solves issue #78, and was suggested by the original author. I had to update a couple of terms to the new notation, so we should be careful with backports.

@Mergifyio backport 3.3.x 2.5.x 2.1.x

Fixes #78

Contributor Checklist

  • Commit messages follow the project guidelines.

  • 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 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.
  • 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 #429 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jan 10, 2025
@mergify
Copy link
Author

mergify bot commented Jan 10, 2025

Cherry-pick of 5f95b79 has failed:

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

You are currently cherry-picking commit 5f95b79.
  (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:   src/main/java/com/eprosima/fastdds/fastddsgen.java

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

@MiguelCompany MiguelCompany added this to the v3.3.2 milestone Jan 10, 2025
@juanjo4936 juanjo4936 self-requested a review January 13, 2025 07:18
Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
@juanjo4936 juanjo4936 force-pushed the mergify/bp/3.3.x/pr-429 branch from 29a0c72 to 9765ae8 Compare January 13, 2025 08:23
@juanjo4936 juanjo4936 added ci-pending PR which CI is running and removed conflicts labels Jan 13, 2025
@juanjo4936 juanjo4936 requested review from MiguelCompany and removed request for juanjo4936 January 13, 2025 08:24
Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
@juanjo4936
Copy link
Contributor

Hand checked that this solves the issue.

@EugenioCollado EugenioCollado self-requested a review January 16, 2025 09:19
Copy link

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

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

LGTM and manual check passed

@EugenioCollado EugenioCollado merged commit bb44c0f into 3.3.x Jan 16, 2025
10 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/3.3.x/pr-429 branch January 16, 2025 09:21
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