8000 [23150] Docs - Apply custom templates to included IDL files (backport #1066) by mergify[bot] · Pull Request #1074 · eProsima/Fast-DDS-docs · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[23150] Docs - Apply custom templates to included IDL files (backport #1066) #1074

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
May 28, 2025
Merged

[23150] Docs - Apply custom templates to included IDL files (backport #1066) #1074

merged 2 commits into from
May 28, 2025

Conversation

mergify[bot]
Copy link
@mergify mergify bot commented May 20, 2025

Description

This PR updates Fast DDS documentation to exemplify how custom templates can be applied to included IDL files.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Related implementation PR:

Contributor Checklist

  • Commit messages follow the project guidelines.
  • Code snippets related to the added documentation have been provided.
  • Documentation tests pass locally.
  • 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.
  • CI passes without warnings or errors.
This is an automatic backport of pull request #1066 done by [Mergify](https://mergify.com).

@mergify Mergify
Copy link
Author
mergify bot commented May 20, 2025

Cherry-pick of bf0dfe6 has failed:

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

You are currently cherry-picking commit bf0dfe6.
  (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:   code/FastDDSGenCodeTester.cpp
	both modified:   docs/fastddsgen/dataTypes/dataTypes.rst

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 label May 20, 2025
@mergify mergify bot mentioned this pull request May 20, 2025
Merged
8 tasks
@MiguelCompany MiguelCompany added this to the v2.10.7 milestone May 28, 2025
cferreiragonz and others added 2 commits May 28, 2025 16:30
@cferreiragonz @MiguelCompany
Docs - Apply custom templates to included IDL files (#1066)
78bfac7 
* Refs #23150: Apply custom templates to included IDL files

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23150: Apply suggestion

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit bf0dfe6)

# Conflicts:
#	code/FastDDSGenCodeTester.cpp
#	docs/fastddsgen/dataTypes/dataTypes.rst
@MiguelCompany
Fix conflicts
68b143e 
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.10.x/pr-1066 branch from 5f830df to 68b143e Compare May 28, 2025 14:30
@MiguelCompany MiguelCompany self-requested a review May 28, 2025 14:32
@MiguelCompany MiguelCompany merged commit f1dbff8 into 2.10.x May 28, 2025
4 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-1066 branch May 28, 2025 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
ci-pending
Projects
None yet
Milestone
v2.10.7 - Frozen ❄️
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @cferreiragonz
0