Skip to content

[25442] Make skip-ci label report required statuses as pass#6442

Merged
MiguelCompany merged 6 commits into
masterfrom
ci/25442
Jun 23, 2026
Merged

[25442] Make skip-ci label report required statuses as pass#6442
MiguelCompany merged 6 commits into
masterfrom
ci/25442

Conversation

@MiguelCompany

@MiguelCompany MiguelCompany commented Jun 22, 2026

Copy link
Copy Markdown
Member

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.

@MiguelCompany MiguelCompany added this to the v3.6.2 milestone Jun 22, 2026
@MiguelCompany MiguelCompany added the skip-ci Automatically pass CI label Jun 22, 2026
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 08:20
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 22, 2026
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 08:28
@MiguelCompany MiguelCompany added conflicts Backport PR wich git cherry pick failed and removed skip-ci Automatically pass CI ci-pending PR which CI is running labels Jun 22, 2026
@MiguelCompany MiguelCompany added skip-ci Automatically pass CI and removed conflicts Backport PR wich git cherry pick failed labels Jun 22, 2026
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 08:33
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 22, 2026
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 08:35
@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label and removed skip-ci Automatically pass CI ci-pending PR which CI is running labels Jun 22, 2026
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 08:37
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 22, 2026
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 08:57
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 09:38
@MiguelCompany MiguelCompany added skip-ci Automatically pass CI and removed no-test Skip CI tests if PR marked with this label ci-pending PR which CI is running labels Jun 22, 2026
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima June 22, 2026 12:07
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 22, 2026

@cferreiragonz cferreiragonz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we apply the same logic to jobs of reusable-sanitizers-ci.yml? Right now, if-conditions are linked to each job, not steps. So jobs will be completely skipped.

Comment thread .github/workflows/reusable-ubuntu-ci.yml
@MiguelCompany

Copy link
Copy Markdown
Member Author

Shouldn't we apply the same logic to jobs of reusable-sanitizers-ci.yml?

Since they don't have a matrix, this is not necessary. Changing it would make it be reported as successful instead of skipped.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany removed the ci-pending PR which CI is running label Jun 23, 2026
@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 requested review from cferreiragonz and removed request for cferreiragonz June 23, 2026 11:05
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 23, 2026
@mergify

mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

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

  • Queue this pull request

@MiguelCompany MiguelCompany merged commit 2ff2b60 into master Jun 23, 2026
53 checks passed
@MiguelCompany MiguelCompany deleted the ci/25442 branch June 23, 2026 14:03
@MiguelCompany

Copy link
Copy Markdown
Member Author

@Mergifyio backport 3.2.x 2.14.x

@mergify

mergify Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

backport 3.2.x 2.14.x

✅ Backports have been created

Details

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

Cherry-pick of 2ff2b60 has failed:

On branch mergify/bp/2.14.x/pr-6442
Your branch is up to date with 'origin/2.14.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/ubuntu-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/reusable-ubuntu-ci.yml
	both modified:   .github/workflows/reusable-windows-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

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.

2 participants