Skip to content

[22596] Update submodules when cloning Fast DDS on CI (backport #5558)#5570

Merged
EugenioCollado merged 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-5558
Jan 21, 2025
Merged

[22596] Update submodules when cloning Fast DDS on CI (backport #5558)#5570
EugenioCollado merged 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-5558

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 13, 2025

Description

This adds submodules: true to the checkout actions on all reusable workflows, making them consistent with the windows one, and thus enabling the IDL parser feature tests.

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

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A: 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.
  • N/A 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.

Tests passed in #5559


This is an automatic backport of pull request #5558 done by Mergify.

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jan 13, 2025

Cherry-pick of 490e80b has failed:

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

You are currently cherry-picking commit 490e80b0.
  (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/reusable-mac-ci.yml
	both modified:   .github/workflows/reusable-sanitizers-ci.yml
	both modified:   .github/workflows/reusable-ubuntu-ci.yml

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 Jan 13, 2025
@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Jan 13, 2025
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5558 branch from a2d14e6 to e2f7f1f Compare January 20, 2025 07:32
@EugenioCollado EugenioCollado self-requested a review January 20, 2025 07:33
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 20, 2025
@EugenioCollado EugenioCollado requested review from EugenioCollado and removed request for EugenioCollado January 20, 2025 07:39
Copy link
Copy Markdown
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

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

LGTM

@EugenioCollado EugenioCollado merged commit ec42a58 into 2.14.x Jan 21, 2025
@EugenioCollado EugenioCollado deleted the mergify/bp/2.14.x/pr-5558 branch January 21, 2025 14:39
@MiguelCompany
Copy link
Copy Markdown
Member

@Mergifyio backport 2.10.x

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 28, 2025

backport 2.10.x

✅ Backports have been created

Details

mergify bot added a commit that referenced this pull request May 28, 2025
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com>
(cherry picked from commit ec42a58)
MiguelCompany pushed a commit that referenced this pull request May 28, 2025
(cherry picked from commit ec42a58)

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com>
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