Skip to content

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

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
Apr 3, 2025
Merged

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

merged 2 commits into from
Apr 3, 2025

Conversation

Carlosespicur
Copy link
Contributor

@Carlosespicur Carlosespicur commented Mar 24, 2025 •
edited
Loading

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.

@Carlosespicur Carlosespicur added the no-test Skip CI tests if PR marked with this label label Mar 24, 2025
@Carlosespicur Carlosespicur requested a review from Mario-DL March 24, 2025 10:46
@github-actions github-actions bot added the ci-pending PR which CI is running label Mar 24, 2025
@Carlosespicur 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
Mario-DL requested changes Mar 27, 2025
View reviewed changes
Copy link
Member

@Mario-DL Mario-DL left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@Carlosespicur Carlosespicur force-pushed the test/ci-related-branch branch from b9d95ab to 21d664a Compare March 31, 2025 07:10
@Mario-DL Mario-DL self-requested a review April 1, 2025 05:31
Mario-DL
Mario-DL approved these changes Apr 1, 2025
View reviewed changes
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@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 2, 2025
@rsanchez15 rsanchez15 merged commit c3ee5e3 into master Apr 3, 2025
14 checks passed
@rsanchez15 rsanchez15 deleted the test/ci-related-branch branch April 3, 2025 06:28
@Mario-DL
Copy link
Member

Mario-DL commented Apr 3, 2025

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 3, 2025 •
edited
Loading

backport 3.1.x 2.14.x 2.10.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Apr 3, 2025
@Carlosespicur @mergify
Get correct Fast CDR related branch in CI (#5730)
2d202dd 
* Refs #22955: Add Fast CDR branch selection in reusable jobs

Signed-off-by: Carlosespicur <[email protected]>

* Refs #22955: Apply suggested changes

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
(cherry picked from commit c3ee5e3)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml
mergify bot pushed a commit that referenced this pull request Apr 3, 2025
@Carlosespicur @mergify
Get correct Fast CDR related branch in CI (#5730)
1d95272 
* Refs #22955: Add Fast CDR branch selection in reusable jobs

Signed-off-by: Carlosespicur <[email protected]>

* Refs #22955: Apply suggested changes

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
(cherry picked from commit c3ee5e3)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml
mergify bot pushed a commit that referenced this pull request Apr 3, 2025
@Carlosespicur @mergify
Get correct Fast CDR related branch in CI (#5730)
8d7d6c3 
* Refs #22955: Add Fast CDR branch selection in reusable jobs

Signed-off-by: Carlosespicur <[email protected]>

* Refs #22955: Apply suggested changes

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
(cherry picked from commit c3ee5e3)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml
This was referenced Apr 3, 2025
Open
Merged
Merged
Mario-DL pushed a commit that referenced this pull request Apr 8, 2025
@mergify @Carlosespicur
Get correct Fast CDR related branch in CI (#5748)
c6f89d3 
* Get correct Fast CDR related branch in CI (#5730)

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

Signed-off-by: Carlosespicur <[email protected]>

* Refs #22955: Apply suggested changes

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
(cherry picked from commit c3ee5e3)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml

* Change Fast CDR branch and solve conflicts

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
Co-authored-by: Carlos Espinoza Curto <[email protected]>
Co-authored-by: Carlosespicur <[email protected]>
MiguelCompany pushed a commit that referenced this pull request May 14, 2025
@Carlosespicur @MiguelCompany
Get correct Fast CDR related branch in CI (#5730)
55fe8a4 
* Refs #22955: Add Fast CDR branch selection in reusable jobs

Signed-off-by: Carlosespicur <[email protected]>

* Refs #22955: Apply suggested changes

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
(cherry picked from commit c3ee5e3)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml
MiguelCompany pushed a commit that referenced this pull request May 16, 2025
@mergify @Carlosespicur
Get correct Fast CDR related branch in CI (#5730) (#5747)
d5fb295 
* Get correct Fast CDR related branch in CI (#5730)

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

Signed-off-by: Carlosespicur <[email protected]>

* Refs #22955: Apply suggested changes

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
(cherry picked from commit c3ee5e3)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml

* Change Fast CDR branch and solve conflicts

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
Co-authored-by: Carlos Espinoza Curto <[email protected]>
Co-authored-by: Carlosespicur <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mario-DL Mario-DL Mario-DL approved these changes

Assignees
No one assigned
Labels
no-test Skip CI tests if PR marked with this label ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Carlosespicur @Mario-DL @rsanchez15