[22955] Get correct Fast CDR related branch in CI by Carlosespicur · Pull Request #5730 · eProsima/Fast-DDS

Carlosespicur · 2025-03-24T10:45:37Z

Description

This PR adds Fast CDR branch selection in sanitizers and Windows/Mac jobs, similarly to how it is done in Ubuntu CI.

@Mergifyio backport 3.1.x 2.14.x 2.10.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 Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are backport compatible: they do NOT break ABI nor change library core behavior.
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.
If this is a critical bug fix, backports to the critical-only supported branches have been requested.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

Mario-DL

Changes look good to me, Windows does not use fastcdr from submodule since it is built with -DTHIRDPARTY_fastcdr=OFF. Leaving a NIT.
We should also include backports to all the supported branches.

.github/workflows/reusable-windows-ci.yml

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

Mario-DL

LGTM

Mario-DL · 2025-04-03T12:34:16Z

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

mergify · 2025-04-03T12:34:25Z

backport 3.1.x 2.14.x 2.10.x

✅ Backports have been created

Details

#5748 [22955] Get correct Fast CDR related branch in CI (backport #5730) has been created for branch 3.1.x but encountered conflicts
#5746 [22955] Get correct Fast CDR related branch in CI (backport #5730) has been created for branch 2.14.x but encountered conflicts
#5747 [22955] Get correct Fast CDR related branch in CI (backport #5730) has been created for branch 2.10.x but encountered conflicts

* Refs #22955: Add Fast CDR branch selection in reusable jobs Signed-off-by: Carlosespicur <carlosespicur@proton.me> * Refs #22955: Apply suggested changes Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> (cherry picked from commit c3ee5e3) # Conflicts: # .github/workflows/reusable-windows-ci.yml

* Get correct Fast CDR related branch in CI (#5730) * Refs #22955: Add Fast CDR branch selection in reusable jobs Signed-off-by: Carlosespicur <carlosespicur@proton.me> * Refs #22955: Apply suggested changes Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> (cherry picked from commit c3ee5e3) # Conflicts: # .github/workflows/reusable-windows-ci.yml * Change Fast CDR branch and solve conflicts Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> Co-authored-by: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com> Co-authored-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22955: Add Fast CDR branch selection in reusable jobs Signed-off-by: Carlosespicur <carlosespicur@proton.me> * Refs #22955: Apply suggested changes Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> (cherry picked from commit c3ee5e3) # Conflicts: # .github/workflows/reusable-windows-ci.yml

* Get correct Fast CDR related branch in CI (#5730) * Refs #22955: Add Fast CDR branch selection in reusable jobs Signed-off-by: Carlosespicur <carlosespicur@proton.me> * Refs #22955: Apply suggested changes Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> (cherry picked from commit c3ee5e3) # Conflicts: # .github/workflows/reusable-windows-ci.yml * Change Fast CDR branch and solve conflicts Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> Co-authored-by: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com> Co-authored-by: Carlosespicur <carlosespicur@proton.me>

Refs #22955: Add Fast CDR branch selection in reusable jobs

0123a65

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

Carlosespicur added the no-test Skip CI tests if PR marked with this label label Mar 24, 2025

Carlosespicur requested a review from Mario-DL March 24, 2025 10:46

github-actions bot added the ci-pending PR which CI is running label Mar 24, 2025

Carlosespicur changed the title ~~[22955] Get correct Fast CDR related branch when imported from other repo in CI~~ [22955] Get correct Fast CDR related branch in CI Mar 24, 2025

Mario-DL suggested changes Mar 27, 2025

View reviewed changes

.github/workflows/reusable-windows-ci.yml Outdated Show resolved Hide resolved

Refs #22955: Apply suggested changes

21d664a

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

Carlosespicur force-pushed the test/ci-related-branch branch from b9d95ab to 21d664a Compare March 31, 2025 07:10

Mario-DL self-requested a review April 1, 2025 05:31

Mario-DL approved these changes Apr 1, 2025

View reviewed changes

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 2, 2025

rsanchez15 merged commit c3ee5e3 into master Apr 3, 2025
14 checks passed

rsanchez15 deleted the test/ci-related-branch branch April 3, 2025 06:28

This was referenced Apr 3, 2025

[22955] Get correct Fast CDR related branch in CI (backport #5730) #5746

Merged

[22955] Get correct Fast CDR related branch in CI (backport #5730) #5747

Merged

[22955] Get correct Fast CDR related branch in CI (backport #5730) #5748

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[22955] Get correct Fast CDR related branch in CI#5730

[22955] Get correct Fast CDR related branch in CI#5730
rsanchez15 merged 2 commits intomasterfrom
test/ci-related-branch

Carlosespicur commented Mar 24, 2025 •

edited

Loading

Uh oh!

Mario-DL left a comment •

edited

Loading

Uh oh!

Uh oh!

Mario-DL left a comment

Uh oh!

Uh oh!

Mario-DL commented Apr 3, 2025

Uh oh!

mergify bot commented Apr 3, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Carlosespicur commented Mar 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

Mario-DL left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Mario-DL left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Mario-DL commented Apr 3, 2025

Uh oh!

mergify bot commented Apr 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Carlosespicur commented Mar 24, 2025 •

edited

Loading

Mario-DL left a comment •

edited

Loading

mergify bot commented Apr 3, 2025 •

edited

Loading