Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 3, 2025

Description

This PR adds Fast CDR branch selection in sanitizers and Windows/Mac jobs, similarly to how it is done in Ubuntu CI.

@Mergifyio backport 3.1.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

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

* Refs #22955: Add Fast CDR branch selection in reusable jobs

Signed-off-by: Carlosespicur <[email protected]>

* Refs #22955: Apply suggested changes

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Carlosespicur <[email protected]>
(cherry picked from commit c3ee5e3)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml
@mergify
Copy link
Contributor Author

mergify bot commented Apr 3, 2025

Cherry-pick of c3ee5e3 has failed:

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

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

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 3, 2025
@Carlosespicur Carlosespicur added this to the v3.1.3 milestone Apr 3, 2025
@Carlosespicur Carlosespicur requested a review from Mario-DL April 3, 2025 13:20
@Carlosespicur Carlosespicur removed the conflicts Backport PR wich git cherry pick failed label Apr 3, 2025
@Carlosespicur Carlosespicur requested review from Carlosespicur and removed request for Mario-DL April 3, 2025 13:45
@github-actions github-actions bot added the ci-pending PR which CI is running label Apr 3, 2025
@Carlosespicur Carlosespicur requested review from Carlosespicur and removed request for Carlosespicur April 4, 2025 10:04
@Mario-DL Mario-DL merged commit c6f89d3 into 3.1.x Apr 8, 2025
32 of 35 checks passed
@Mario-DL Mario-DL deleted the mergify/bp/3.1.x/pr-5730 branch April 8, 2025 06:20
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants