Skip to content

[23082] Force Asio Thirdparty in MacOS CI (backport #5769) #5774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.14.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 23, 2025

Description

Brew now installs asio 1.34 in which io_service was removed.
This PR forces mac ci to use asio from thirdparty.

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

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

  • N/A 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.
  • N/A: 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.
  • N/A: Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5769 done by [Mergify](https://mergify.com).

* Force Asio Thirdparty in MacOS CI

Signed-off-by: Mario Dominguez <[email protected]>

* Nighties

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit c848baf)

# Conflicts:
#	.github/workflows/nightly-mac-2.10.x.yml
#	.github/workflows/nightly-mac-2.14.x.yml
#	.github/workflows/nightly-mac-3.1.x.yml
#	.github/workflows/weekly-mac-2.6.x.yml
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 23, 2025
Copy link
Contributor Author

mergify bot commented Apr 23, 2025

Cherry-pick of c848baf has failed:

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

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

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/nightly-mac-2.10.x.yml
	deleted by us:   .github/workflows/nightly-mac-2.14.x.yml
	deleted by us:   .github/workflows/nightly-mac-3.1.x.yml
	deleted by us:   .github/workflows/weekly-mac-2.6.x.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 mentioned this pull request Apr 23, 2025
7 tasks
@Mario-DL Mario-DL added this to the v2.14.5 milestone Apr 24, 2025
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