Skip to content

[20694] Build Fast DDS Python bindings in Fast DDS Docs Github CI job (backport #4628) - #4643

Merged
MiguelCompany merged 1 commit into
2.10.xfrom
mergify/bp/2.10.x/pr-4628
May 21, 2024
Merged

MiguelCompany merged 1 commit into
2.10.xfrom
mergify/bp/2.10.x/pr-4628

Conversation

@mergify

@mergify mergify Bot commented Apr 3, 2024

Copy link
Copy Markdown
Contributor

Description

This PR extends the ubuntu-build-and-test-documentation Github CI job to include Fast DDS Python in the build.
It also uses a new action from eProsima-CI to deduce which branch to use:

TODO:

  • Drop the commit Refs #20694: DROP Run docs CI even when skip-ci that is added to ease reviewing the PR
  • Pin used version of get_related_branch_from_repo once eProsima-CI releases the new action

@Mergifyio backport 2.13.x 2.10.x 2.6.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: Changes are ABI compatible.

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

@mergify

mergify Bot commented Apr 3, 2024

Copy link
Copy Markdown
Contributor Author

Cherry-pick of decf689 has failed:

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

You are currently cherry-picking commit decf68986.
  (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:   .github/workflows/documentation-tests.yaml

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 Apr 3, 2024
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Apr 3, 2024
@MiguelCompany

Copy link
Copy Markdown
Member

@EduPonz Would you mind addressing the conflicts here?

@MiguelCompany
MiguelCompany force-pushed the mergify/bp/2.10.x/pr-4628 branch from b31fb77 to bccae7f Compare May 21, 2024 13:40
@MiguelCompany
MiguelCompany self-requested a review May 21, 2024 13:41
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label May 21, 2024
@MiguelCompany
MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany May 21, 2024 13:41
@github-actions github-actions Bot added the ci-pending PR which CI is running label May 21, 2024
* Refs #20694: Use ci.repos to get gtest

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20694: Use eProsima-CI to choose Fast DDS Docs branch

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20694: Use eProsima-CI to choose Fast DDS Python branch

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20694: Get deduced branch output correctly

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20694: Use CMake 3.22.6

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20694: Pin get_related_branch_from_repo action version to v0

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit decf689)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
@MiguelCompany
MiguelCompany force-pushed the mergify/bp/2.10.x/pr-4628 branch from bccae7f to 6ed1626 Compare May 21, 2024 13:45
@MiguelCompany
MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany May 21, 2024 13:46
@MiguelCompany
MiguelCompany merged commit 0ba40c9 into 2.10.x May 21, 2024
@MiguelCompany
MiguelCompany deleted the mergify/bp/2.10.x/pr-4628 branch May 21, 2024 16:28
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.

2 participants