Skip to content

[22970] Bump to asio 1.34.2#5896

Merged
MiguelCompany merged 5 commits intomasterfrom
hotfix/asio-deprecated-api
Jun 25, 2025
Merged

[22970] Bump to asio 1.34.2#5896
MiguelCompany merged 5 commits intomasterfrom
hotfix/asio-deprecated-api

Conversation

@Carlosespicur
Copy link
Copy Markdown
Contributor

@Carlosespicur Carlosespicur commented Jun 20, 2025 •
edited by cferreiragonz
Loading

Description

This PR bumps thirdparty asio module to 1.34.2 release and fixes deprecated API related to io_service, address_v4, address_v6 and tcp::resolver, avoiding build failures. Fixes:

@Mergifyio backport 3.2.x 2.14.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.
  • 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.
  • Check CI results: failing tests are unrelated with the changes.

@Carlosespicur Carlosespicur added this to the v3.3.0 milestone Jun 20, 2025
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 20, 2025
@Carlosespicur Carlosespicur requested review from MiguelCompany and removed request for MiguelCompany June 20, 2025 10:20
cferreiragonz
cferreiragonz requested changes Jun 24, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@cferreiragonz cferreiragonz left a comment

Choose a reason for hiding this comment

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

Nice job with the migration. Just a small NIT. Let's raise the minimum Asio version to 1.12.0 to avoid compilation errors if someone tries to compile with an older version. (Here)

@Carlosespicur
Copy link
Copy Markdown
Contributor Author

Carlosespicur commented Jun 24, 2025

Nice job with the migration. Just a small NIT. Let's raise the minimum Asio version to 1.12.0 to avoid compilation errors if someone tries to compile with an older version. (Here)

Changes applied on d564f45 . Raised to 1.13.0 to allow using make_strand method, according to the release notes

cferreiragonz
cferreiragonz previously approved these changes Jun 24, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

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

@cferreiragonz cferreiragonz removed the request for review from MiguelCompany June 25, 2025 05:32
@Carlosespicur Carlosespicur force-pushed the hotfix/asio-deprecated-api branch from d564f45 to f1188d8 Compare June 25, 2025 07:24
@Carlosespicur
Refs #22970: Bump to asio 1.34
03effab 
Signed-off-by: Carlosespicur <carlosespicur@proton.me>
@Carlosespicur
Refs #22970: Update thirdparty module to 1.34.2 release
dbcfa90 
Signed-off-by: Carlosespicur <carlosespicur@proton.me>
@Carlosespicur
Refs #22970: Update versions.md
83cb47f 
Signed-off-by: Carlosespicur <carlosespicur@proton.me>
@Carlosespicur
Refs #22970: Uncrustify
ea811f5 
Signed-off-by: Carlosespicur <carlosespicur@proton.me>
@Carlosespicur
Refs #22970: Update Asio minimum version in CMakeLists
3e0754d 
Signed-off-by: Carlosespicur <carlosespicur@proton.me>
@Carlosespicur Carlosespicur force-pushed the hotfix/asio-deprecated-api branch from f1188d8 to 3e0754d Compare June 25, 2025 07:59
@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jun 25, 2025
@cferreiragonz
Copy link
Copy Markdown
Contributor

cferreiragonz commented Jun 25, 2025

CI passed before rebasing to fix conflicts in versions.md:
Fast DDS Ubuntu CI
Fast DDS MacOS CI
Fast DDS Windows CI
Fast DDS Sanitizers CI

@MiguelCompany MiguelCompany merged commit da0e9ed into master Jun 25, 2025
4 checks passed
@MiguelCompany MiguelCompany deleted the hotfix/asio-deprecated-api branch June 25, 2025 08:18
@cferreiragonz
Copy link
Copy Markdown
Contributor

cferreiragonz commented Jun 25, 2025

@Mergifyio backport 3.2.x 2.14.x

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 25, 2025 •
edited
Loading

backport 3.2.x 2.14.x

❌ No backport have been created

Details

Git reported the following error:

Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt
Auto-merging src/cpp/rtps/transport/TCPAcceptor.cpp
Auto-merging src/cpp/rtps/transport/TCPAcceptor.h
Auto-merging src/cpp/rtps/transport/TCPAcceptorBasic.cpp
Auto-merging src/cpp/rtps/transport/TCPAcceptorSecure.cpp
Auto-merging src/cpp/rtps/transport/TCPAcceptorSecure.h
Auto-merging src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
Auto-merging src/cpp/rtps/transport/TCPChannelResourceBasic.h
Auto-merging src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
Auto-merging src/cpp/rtps/transport/TCPChannelResourceSecure.h
Auto-merging src/cpp/rtps/transport/TCPTransportInterface.cpp
Auto-merging src/cpp/rtps/transport/TCPTransportInterface.h
Auto-merging src/cpp/rtps/transport/TCPv4Transport.cpp
Auto-merging src/cpp/rtps/transport/TCPv6Transport.cpp
Auto-merging src/cpp/rtps/transport/UDPChannelResource.h
Auto-merging src/cpp/rtps/transport/UDPTransportInterface.cpp
Auto-merging src/cpp/rtps/transport/UDPTransportInterface.h
Auto-merging src/cpp/rtps/transport/UDPv4Transport.cpp
Auto-merging src/cpp/rtps/transport/UDPv6Transport.cpp
Auto-merging src/cpp/rtps/transport/test_UDPv4Transport.cpp
Auto-merging src/cpp/utils/IPLocator.cpp
Auto-merging test/blackbox/common/UDPMessageSender.hpp
Auto-merging test/unittest/transport/AsioHelpersTests.cpp
Auto-merging test/unittest/transport/TCPv4Tests.cpp
Auto-merging test/unittest/transport/TCPv6Tests.cpp
Failed to merge submodule thirdparty/asio (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/asio
Auto-merging versions.md
CONFLICT (content): Merge conflict in versions.md
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add thirdparty/asio

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
error: could not apply da0e9edb... Bump to asio 1.34.2 (#5896)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

mergify Bot pushed a commit that referenced this pull request Jun 25, 2025
@Carlosespicur @mergify
Bump to asio 1.34.2 (#5896)
d194c15 
* Refs #22970: Bump to asio 1.34

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update thirdparty module to 1.34.2 release

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update versions.md

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Uncrustify

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update Asio minimum version in CMakeLists

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit da0e9ed)

# Conflicts:
#	versions.md
@mergify mergify Bot mentioned this pull request Jun 25, 2025
Merged
11 tasks
@cferreiragonz cferreiragonz mentioned this pull request Jun 25, 2025
Closed
1 task
@Carlosespicur
Copy link
Copy Markdown
Contributor Author

Carlosespicur commented Jun 27, 2025

@Mergifyio backport 2.14.x

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 27, 2025 •
edited
Loading

backport 2.14.x

❌ No backport have been created

Details
  • Backport to branch 2.14.x failed

Git reported the following error:

Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt
Auto-merging src/cpp/rtps/transport/TCPAcceptor.cpp
Auto-merging src/cpp/rtps/transport/TCPAcceptor.h
Auto-merging src/cpp/rtps/transport/TCPAcceptorBasic.cpp
Auto-merging src/cpp/rtps/transport/TCPAcceptorSecure.cpp
Auto-merging src/cpp/rtps/transport/TCPAcceptorSecure.h
Auto-merging src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
Auto-merging src/cpp/rtps/transport/TCPChannelResourceBasic.h
Auto-merging src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
Auto-merging src/cpp/rtps/transport/TCPChannelResourceSecure.h
Auto-merging src/cpp/rtps/transport/TCPTransportInterface.cpp
Auto-merging src/cpp/rtps/transport/TCPTransportInterface.h
Auto-merging src/cpp/rtps/transport/TCPv4Transport.cpp
Auto-merging src/cpp/rtps/transport/TCPv6Transport.cpp
Auto-merging src/cpp/rtps/transport/UDPChannelResource.h
Auto-merging src/cpp/rtps/transport/UDPTransportInterface.cpp
Auto-merging src/cpp/rtps/transport/UDPTransportInterface.h
Auto-merging src/cpp/rtps/transport/UDPv4Transport.cpp
Auto-merging src/cpp/rtps/transport/UDPv6Transport.cpp
Auto-merging src/cpp/rtps/transport/test_UDPv4Transport.cpp
Auto-merging src/cpp/utils/IPLocator.cpp
Auto-merging test/blackbox/common/UDPMessageSender.hpp
Auto-merging test/unittest/transport/AsioHelpersTests.cpp
Auto-merging test/unittest/transport/TCPv4Tests.cpp
Auto-merging test/unittest/transport/TCPv6Tests.cpp
Failed to merge submodule thirdparty/asio (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/asio
Auto-merging versions.md
CONFLICT (content): Merge conflict in versions.md
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add thirdparty/asio

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
error: could not apply da0e9edb... Bump to asio 1.34.2 (#5896)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

Carlosespicur added a commit that referenced this pull request Jun 27, 2025
@Carlosespicur
Bump to asio 1.34.2 (#5896)
659d635 
* Refs #22970: Bump to asio 1.34

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update thirdparty module to 1.34.2 release

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update versions.md

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Uncrustify

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update Asio minimum version in CMakeLists

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
MiguelCompany added a commit that referenced this pull request Jul 2, 2025
@mergify @Carlosespicur @MiguelCompany
Bump to asio 1.34.2 (#5896) (#5902)
cd7ca97 
* Bump to asio 1.34.2 (#5896)

* Refs #22970: Bump to asio 1.34

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update thirdparty module to 1.34.2 release

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update versions.md

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Uncrustify

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update Asio minimum version in CMakeLists

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit da0e9ed)

# Conflicts:
#	versions.md

* Fix conflicts

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
EugenioCollado pushed a commit that referenced this pull request Jul 2, 2025
@Carlosespicur @EugenioCollado
Bump to asio 1.34.2 (#5896)
c826807 
* Refs #22970: Bump to asio 1.34

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update thirdparty module to 1.34.2 release

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update versions.md

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Uncrustify

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update Asio minimum version in CMakeLists

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
MiguelCompany pushed a commit that referenced this pull request Jul 3, 2025
@Carlosespicur @EugenioCollado
Bump to asio 1.34.2 (#5896) (#5907)
59aa8bb 
* Bump to asio 1.34.2 (#5896)

* Refs #22970: Bump to asio 1.34

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update thirdparty module to 1.34.2 release

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update versions.md

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Uncrustify

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Refs #22970: Update Asio minimum version in CMakeLists

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Uncrustify

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com>
archlinux-github pushed a commit to archlinux/aur that referenced this pull request Oct 27, 2025
@kistlin
Update to v3.4.0
d6d7845 
[22970] Bump to asio 1.34.2
eProsima/Fast-DDS#5896
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cferreiragonz cferreiragonz cferreiragonz approved these changes

Assignees

No one assigned

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Milestone

v3.3.0 - Frozen ❄️

Development

Successfully merging this pull request may close these issues.

3 participants

@Carlosespicur @cferreiragonz @MiguelCompany