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

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

Merged
merged 1 commit into from
Apr 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 3, 2024

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 added the conflicts Backport PR wich git cherry pick failed label Apr 3, 2024
Copy link
Contributor Author

mergify bot commented Apr 3, 2024

Cherry-pick of decf689 has failed:

On branch mergify/bp/2.6.x/pr-4628
Your branch is up to date with 'origin/2.6.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

@Mario-DL
Copy link
Member

Mario-DL commented Apr 4, 2024

@EduPonz would you mind addressing the conflicts here ?

* 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)
@Mario-DL Mario-DL self-requested a review April 4, 2024 12:57
@Mario-DL Mario-DL added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Apr 4, 2024
@Mario-DL Mario-DL closed this Apr 4, 2024
@Mario-DL Mario-DL reopened this Apr 4, 2024
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL April 8, 2024 05:43
@Mario-DL
Copy link
Member

Mario-DL commented Apr 8, 2024

As this PR in only modifying the docs workflow, I won`t trigger jenkins ci

@Mario-DL Mario-DL 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 Apr 8, 2024
@EduPonz EduPonz merged commit 245fdd0 into 2.6.x Apr 10, 2024
14 of 18 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4628 branch April 10, 2024 06:29
MiguelCompany pushed a commit that referenced this pull request May 21, 2024
…#4644)

* 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 pushed a commit that referenced this pull request 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 pushed a commit that referenced this pull request May 21, 2024
…#4643)

* Refs #20694: Use ci.repos to get gtest



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



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



* Refs #20694: Get deduced branch output correctly



* Refs #20694: Use CMake 3.22.6



* Refs #20694: Pin get_related_branch_from_repo action version to v0



---------


(cherry picked from commit decf689)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
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