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.

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

[20486] Avoid running GitHub CI if PR has conflicts #4489

Merged
merged 2 commits into from
Mar 1, 2024
Merged

[20486] Avoid running GitHub CI if PR has conflicts #4489

merged 2 commits into from
Mar 1, 2024

Conversation

JesusPoderoso
Copy link
Contributor

@JesusPoderoso JesusPoderoso commented Mar 1, 2024 •
edited by MiguelCompany
Loading

Description

While backporting fixes and ABI compatible features to other supported versions branches, some of those backports can have conflicts caused by the cherry-pick.
In order to improve the performance of our CI and don't waste runners process time, this PR avoids running any GitHub CI if the PR has been labeled with the conflicts label.

NOTE: For the PR purposes, it has been labeled as conflicts to ensure that the GitHub CI is not run.

@Mergifyio backport 2.13.x 2.12.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 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.
  • 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
Refs #20486: Avoid running GitHub CI if PR has conflicts
292d9d1 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso added the conflicts Backport PR wich git cherry pick failed label Mar 1, 2024
@JesusPoderoso JesusPoderoso added this to the v2.14.0 milestone Mar 1, 2024
@JesusPoderoso JesusPoderoso self-assigned this Mar 1, 2024
@JesusPoderoso
Refs #20486: Add missing job
5c5a4a6 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@MiguelCompany MiguelCompany merged commit 3ed793c into master Mar 1, 2024
9 checks passed
@MiguelCompany MiguelCompany deleted the hotfix/conflicts_ci branch March 1, 2024 09:13
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.13.x 2.12.x 2.10.x 2.6.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Mar 1, 2024 •
edited
Loading

backport 2.13.x 2.12.x 2.10.x 2.6.x

✅ Backports have been created

@mergify mergify bot mentioned this pull request Mar 1, 2024
Merged
@mergify mergify bot mentioned this pull request Mar 1, 2024
Merged
@mergify mergify bot mentioned this pull request Mar 1, 2024
Merged
@mergify mergify bot mentioned this pull request Mar 1, 2024
Merged
JesusPoderoso added a commit that referenced this pull request Mar 1, 2024
@JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489)
5ea040c 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)
JesusPoderoso added a commit that referenced this pull request Mar 1, 2024
@JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489)
27915b8 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)
JesusPoderoso added a commit that referenced this pull request Mar 1, 2024
@JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489)
078a534 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)
JesusPoderoso added a commit that referenced this pull request Mar 1, 2024
@JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489)
c627c5d 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)
EduPonz pushed a commit that referenced this pull request Mar 1, 2024
@mergify @JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489) (#4490)
a9a5666 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Mar 1, 2024
@mergify @JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489) (#4491)
6dabb3e 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Mar 1, 2024
@mergify @JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489) (#4492)
b99072d 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Mar 1, 2024
@mergify @JesusPoderoso
Avoid running GitHub CI if PR has conflicts (#4489) (#4493)
4c2b721 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
cferreiragonz pushed a commit that referenced this pull request Mar 11, 2024
@mergify @JesusPoderoso @cferreiragonz
Avoid running GitHub CI if PR has conflicts (#4489) (#4492)
dab19b7 
* Refs #20486: Avoid running GitHub CI if PR has conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20486: Add missing job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 3ed793c)

Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees

@JesusPoderoso JesusPoderoso

Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Milestone
v2.14.0
Development

Successfully merging this pull request may close these issues.
2 participants
@JesusPoderoso @MiguelCompany