Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 10, 2025

Description

@Mergifyio backport 4.1.x 4.0.x 3.3.x 2.1.x

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

* Refs #23788. Fix windows build on cmake example with shared libs

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

* Refs #23789. Apply suggestion.

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

---------

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

# Conflicts:
#	src/main/java/com/eprosima/fastdds/idl/templates/CMakeLists.stg
@mergify mergify bot added the conflicts label Oct 10, 2025
Copy link
Author

mergify bot commented Oct 10, 2025

Cherry-pick of 564b231 has failed:

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

You are currently cherry-picking commit 564b231.
  (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/idl/templates/CMakeLists.stg

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

Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany self-requested a review October 10, 2025 10:28
@github-actions github-actions bot added ci-pending PR which CI is running labels Oct 10, 2025
@MiguelCompany MiguelCompany merged commit 8d30bf0 into 3.3.x Oct 11, 2025
7 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.3.x/pr-525 branch October 11, 2025 12:25
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