Skip to content

[21387] Fix windows CI and add vanilla build step in ubuntu CI (backport #5095) #5099

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

Merged
merged 1 commit into from
Jul 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 23, 2024

Description

This PR fixes the windows CI that was using a removed eProsima-CI action, and includes a vanilla build job in ubuntu CI.
As part of the CI, it is backported to 2.6.x

@Mergifyio backport 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)

  • N/A Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • 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.
  • 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.

This is an automatic backport of pull request #5095 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jul 23, 2024
Copy link
Contributor Author

mergify bot commented Jul 23, 2024

Cherry-pick of 55ca0aa has failed:

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

You are currently cherry-picking commit 55ca0aac4.
  (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-ubuntu-ci.yml
	both modified:   .github/workflows/reusable-windows-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

* Refs #21387: Fix windows CI

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

* Refs #21387: Add vanilla build in ubuntu CI

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

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 55ca0aa)
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-5095 branch from a701fa9 to 9f3c0f7 Compare July 23, 2024 09:02
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Jul 23, 2024
@JesusPoderoso JesusPoderoso added this to the v2.6.10 milestone Jul 23, 2024
@JesusPoderoso JesusPoderoso self-requested a review July 23, 2024 09:02
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@github-actions github-actions bot added the ci-pending PR which CI is running label Jul 23, 2024
@JesusPoderoso
Copy link
Contributor

Ci issues unrelated to the PR.
Ready to merge!

@JesusPoderoso JesusPoderoso 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 Jul 23, 2024
@MiguelCompany MiguelCompany merged commit 53e903a into 2.6.x Jul 23, 2024
14 of 17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-5095 branch July 23, 2024 13:20
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.

2 participants