Skip to content

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

Open
mergify[bot] wants to merge 1 commit into
3.2.xfrom
mergify/bp/3.2.x/pr-6442
Open

[25442] Make skip-ci label report required statuses as pass (backport #6442)#6443
mergify[bot] wants to merge 1 commit into
3.2.xfrom
mergify/bp/3.2.x/pr-6442

Conversation

@mergify

@mergify mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Description

@Mergifyio backport 3.2.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A: The code follows the style guidelines of this project.

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

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

  • 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 #6442 done by [Mergify](https://mergify.com).

* Refs #25442. Update Windows workflows

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

* Refs #25442. Update Mac workflows

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

* Refs #25442. Update Sanitizer workflows

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

* Refs #25442. Update Ubuntu workflows

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

* Refs #25442. Improve readability.

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

* Refs #25442. Fix condition for add-label.

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

---------

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

# Conflicts:
#	.github/workflows/reusable-ubuntu-ci.yml
#	.github/workflows/sanitizers-ci.yml
#	.github/workflows/windows-ci.yml
@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Jun 23, 2026
@mergify

mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 2ff2b60 has failed:

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

You are currently cherry-picking commit 2ff2b6031.
  (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/mac-ci.yml
	modified:   .github/workflows/reusable-mac-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/reusable-ubuntu-ci.yml
	both modified:   .github/workflows/sanitizers-ci.yml
	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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts Backport PR wich git cherry pick failed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant