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

[20542] Fix CI version management #4483

Merged
merged 8 commits into from
Mar 8, 2024

Conversation

JesusPoderoso
Copy link
Contributor

@JesusPoderoso JesusPoderoso commented Feb 29, 2024

Description

This PR unifies the CI in all workflows to follow this behavior:

  • Trigger CI in all pull requests which HEAD branch is set to this supported branch version
  • Remove nightly events in supported branches, since they are only run in default / base branch (master).
  • Include missing ignore files for the sanitizer event trigger.
  • Fix the default branch in workflows as this supported version branch.

master related PR:

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 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.
  • N/A 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 Check CI results: changes do not issue any warning.
  • N/A Check CI results: failing tests are unrelated with the changes.

@JesusPoderoso JesusPoderoso added the skip-ci Automatically pass CI label Feb 29, 2024
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Feb 29, 2024
@JesusPoderoso JesusPoderoso self-assigned this Feb 29, 2024
@JesusPoderoso JesusPoderoso changed the title Refs #20542: Fix CI version management [20542] Fix CI version management Feb 29, 2024
.github/workflows/sanitizer-tests.yaml Outdated Show resolved Hide resolved
@JesusPoderoso
Copy link
Contributor Author

@richiprosima please test this

@JesusPoderoso JesusPoderoso force-pushed the hotfix/ci_version_management_2.10.x branch 2 times, most recently from 1506e92 to af34320 Compare March 6, 2024 15:14
@MiguelCompany
Copy link
Member

@JesusPoderoso Would you mind resolving the conflicts here ?

@JesusPoderoso JesusPoderoso force-pushed the hotfix/ci_version_management_2.10.x branch from af34320 to 3313ae6 Compare March 7, 2024 06:55
@MiguelCompany MiguelCompany added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. skip-ci Automatically pass CI and removed skip-ci Automatically pass CI labels Mar 7, 2024
@MiguelCompany
Copy link
Member

@Mergifyio rebase

@MiguelCompany MiguelCompany removed the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Mar 8, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Copy link
Contributor

mergify bot commented Mar 8, 2024

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the hotfix/ci_version_management_2.10.x branch from 3313ae6 to d34176b Compare March 8, 2024 12:05
@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Mar 8, 2024
@MiguelCompany MiguelCompany dismissed elianalf’s stale review March 8, 2024 14:06

Already approved by official maintainer of 2.10.x

@MiguelCompany MiguelCompany merged commit 292ac5f into 2.10.x Mar 8, 2024
7 of 10 checks passed
@MiguelCompany MiguelCompany deleted the hotfix/ci_version_management_2.10.x branch March 8, 2024 14:07
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.

3 participants