Skip to content

[25442] Make skip-ci label report required statuses as pass (backport #581) (backport #582)#586

Merged
MiguelCompany merged 2 commits into
2.1.xfrom
mergify/bp/2.1.x/pr-582
Jun 24, 2026
Merged

[25442] Make skip-ci label report required statuses as pass (backport #581) (backport #582)#586
MiguelCompany merged 2 commits into
2.1.xfrom
mergify/bp/2.1.x/pr-582

Conversation

@mergify

@mergify mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown

Description

Move conditionals in the CI from jobs to steps, so the options in matrix are always considered, and thus all the corresponding statuses are shown as passed when the skip-ci label is present.

@Mergifyio backport 4.0.x 3.3.x 2.1.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • 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: 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.
  • 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 #581 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #582 done by [Mergify](https://mergify.com).

* Make `skip-ci` label report required statuses as pass (#581)

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 724b278)

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

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 6380762)

# Conflicts:
#	.github/workflows/reusable-ubuntu-ci.yml
@mergify mergify Bot added the conflicts label Jun 23, 2026
@mergify

mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown
Author

Cherry-pick of 6380762 has failed:

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

You are currently cherry-picking commit 6380762.
  (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

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 commented Jun 23, 2026

Copy link
Copy Markdown
Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added the skip-ci Automatically pass CI label Jun 24, 2026
@MiguelCompany MiguelCompany self-requested a review June 24, 2026 05:56
@MiguelCompany MiguelCompany added this to the v2.1.5 milestone Jun 24, 2026
@MiguelCompany MiguelCompany added no-test and removed skip-ci Automatically pass CI labels Jun 24, 2026
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany June 24, 2026 05:57
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 24, 2026
@MiguelCompany MiguelCompany merged commit 4753e1e into 2.1.x Jun 24, 2026
5 of 6 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-582 branch June 24, 2026 06:22
MiguelCompany added a commit that referenced this pull request Jun 24, 2026
…586)

* Make `skip-ci` label report required statuses as pass (#581) (#582)

* Make `skip-ci` label report required statuses as pass (#581)

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 724b278)

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

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 6380762)

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

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany added a commit that referenced this pull request Jun 24, 2026
…586)

* Make `skip-ci` label report required statuses as pass (#581) (#582)

* Make `skip-ci` label report required statuses as pass (#581)

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 724b278)

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

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 6380762)

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

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@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 no-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant