Skip to content

[25442] Make skip-ci label report required statuses as pass (backport #307)#308

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

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

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 2.2.x 1.4.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • 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
  • Changes are API compatible.
  • 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 #307 done by [Mergify](https://mergify.com).

* Refs #25442. Move execution conditions to steps.

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

* Refs #25442. Update condition for run-tests.

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

* Refs #25442. Similar changes for windows.

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

* Refs #25442. Don't upload build artifact when tests are skipped.

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

* Refs #25442. Fix condition for addding ci-pending label.

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

---------

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

# Conflicts:
#	.github/workflows/windows-ci.yml
@mergify

mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown
Author

Cherry-pick of ec6fb0a has failed:

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

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

Changes to be committed:
	modified:   .github/workflows/reusable-ubuntu-ci.yml
	modified:   .github/workflows/reusable-windows-ci.yml
	modified:   .github/workflows/ubuntu-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/windows-ci.yml

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

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added the skip-ci Automatically pass CI label Jun 23, 2026
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany June 23, 2026 14:09
@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label and removed skip-ci Automatically pass CI labels Jun 23, 2026
@MiguelCompany MiguelCompany self-requested a review June 23, 2026 14:14
@github-actions github-actions Bot added ci-pending PR which CI is running labels Jun 23, 2026
@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

@MiguelCompany MiguelCompany merged commit bb16a4f into 2.2.x Jun 24, 2026
15 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.2.x/pr-307 branch June 24, 2026 05:58
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 Skip CI tests if PR marked with this label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant