Skip to content

[23082] Force Asio Thirdparty in MacOS CI #5769

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Apr 22, 2025
Merged

[23082] Force Asio Thirdparty in MacOS CI #5769

merged 2 commits into from
Apr 22, 2025

Conversation

Mario-DL
Copy link
Member

@Mario-DL Mario-DL commented Apr 21, 2025 •
edited by MiguelCompany
Loading

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.

@Mario-DL
Force Asio Thirdparty in MacOS CI
99b1051 
Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL Mario-DL added this to the v3.2.2 milestone Apr 21, 2025
@Mario-DL Mario-DL added the no-test Skip CI tests if PR marked with this label label Apr 21, 2025
@Mario-DL Mario-DL requested review from richiprosima and removed request for richiprosima April 21, 2025 15:16
@github-actions github-actions bot added the ci-pending PR which CI is running label Apr 21, 2025
@Mario-DL
Nighties
919a2a2 
Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL Mario-DL changed the title [ ] Force Asio Thirdparty in MacOS CI [23082] Force Asio Thirdparty in MacOS CI Apr 21, 2025
@Mario-DL Mario-DL marked this pull request as ready for review April 21, 2025 15:39
@MiguelCompany MiguelCompany self-requested a review April 22, 2025 06:27
MiguelCompany
MiguelCompany approved these changes Apr 22, 2025
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI (specially Mac)

@MiguelCompany MiguelCompany merged commit c848baf into master Apr 22, 2025
14 checks passed
@MiguelCompany MiguelCompany deleted the ci/fix/asio-mac branch April 22, 2025 09:16
@Mario-DL
Copy link
Member Author

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 23, 2025 •
edited
Loading

backport 3.1.x 2.14.x 2.10.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Apr 23, 2025
@Mario-DL @mergify
Force Asio Thirdparty in MacOS CI (#5769)
39983c6 
* 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 bot pushed a commit that referenced this pull request Apr 23, 2025
@Mario-DL @mergify
Force Asio Thirdparty in MacOS CI (#5769)
93a8a94 
* 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 mentioned this pull request Apr 23, 2025
Merged
7 tasks
mergify bot pushed a commit that referenced this pull request Apr 23, 2025
@Mario-DL @mergify
Force Asio Thirdparty in MacOS CI (#5769)
1954fc6 
* 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
This was referenced Apr 23, 2025
Open
Merged
@Mario-DL Mario-DL mentioned this pull request Apr 23, 2025
Merged
7 tasks
MiguelCompany pushed a commit that referenced this pull request May 13, 2025
@mergify @Mario-DL
Force Asio Thirdparty in MacOS CI (#5769) (#5773)
1f64d91 
* Force Asio Thirdparty in MacOS CI (#5769)

* 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

* Fix conflicts

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

---------

Signed-off-by: Mario Dominguez <[email protected]>
Co-authored-by: Mario Domínguez López <[email protected]>
Co-authored-by: Mario Dominguez <[email protected]>
MiguelCompany pushed a commit that referenced this pull request May 14, 2025
@mergify @Mario-DL
Force Asio Thirdparty in MacOS CI (#5769) (#5775)
031752b 
* Force Asio Thirdparty in MacOS CI (#5769)

* 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

* Fix conflicts

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

---------

Signed-off-by: Mario Dominguez <[email protected]>
Co-authored-by: Mario Domínguez López <[email protected]>
Co-authored-by: Mario Dominguez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
ci-pending PR which CI is running no-test Skip CI tests if PR marked with this label
Projects
None yet
Milestone
v3.2.2
Development

Successfully merging this pull request may close these issues.
2 participants
@Mario-DL @MiguelCompany