Skip to content

[Backport support/2.14] Bump Boost shipped for Windows to v1.87#10651

Merged
yhabteab merged 9 commits intosupport/2.14from
backport-10278-to-support/2.14
Dec 2, 2025
Merged

[Backport support/2.14] Bump Boost shipped for Windows to v1.87#10651
yhabteab merged 9 commits intosupport/2.14from
backport-10278-to-support/2.14

Conversation

@yhabteab
Copy link
Member

@yhabteab yhabteab commented Nov 28, 2025

Al2Klimov and others added 8 commits November 28, 2025 16:30
It was removed in Boost 1.87.

(cherry picked from commit 7bd35d8)
not just boost::coroutines::detail::forced_unwind.

This is needed because as of Boost 1.87, boost::asio::spawn() uses Fiber, not Coroutine v1.
boostorg/asio@df973a85ed69f021

This is safe because every actual exception shall inherit from std::exception. Except forced_unwind and its Fiber equivalent, so that `catch(const std::exception&)` doesn't catch them and only them.

(cherry picked from commit 0662f2b)
Creating the string_view from the std::string (as returned by GetData()) uses
the stored length instead of having to detect it by finding '\0'.

(cherry picked from commit ccfc722)
Simply giving two entire call expressions for either Boost version greatly
improves readability in my opinion.

(cherry picked from commit d1d399f)
f isn't used otherwise in the function, so if possible, it can just be moved into the lambda, avoiding a copy.

Co-authored-by: Alexander Aleksandrovič Klimov <alexander.klimov@icinga.com>
(cherry picked from commit d3fae44)
@yhabteab yhabteab added this to the 2.14.8 milestone Nov 28, 2025
@yhabteab yhabteab requested a review from julianbrost November 28, 2025 15:32
@cla-bot cla-bot bot added the cla/signed label Nov 28, 2025
@yhabteab yhabteab changed the title [Backport support/2.14] Bump Boost shipped for Windows to v1.87 #10278 [Backport support/2.14] Bump Boost shipped for Windows to v1.87 Nov 28, 2025
Copy link
Member

@julianbrost julianbrost left a comment

Choose a reason for hiding this comment

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

Please add the missing mailmap entry so that the remaining CI check is happy as well. (Apart from that, fine for me.)

@yhabteab
Copy link
Member Author

yhabteab commented Dec 1, 2025

Please add the missing mailmap entry so that the remaining CI check is happy as well. (Apart from that, fine for me.)

It's not just this author that's missing. There're also a bunch of others which I simply ignored not spam with a bunch of useless update authors file PRs. It's not relevant for any build stages, so I don't think its worth wasting the time in picking the individual PRs and try to backport them. #10650 (comment)

@julianbrost
Copy link
Member

It's not just this author that's missing.

Who else is missing?

Though actually nobody is missing here. This PR should just need the additional line added by d81607d to be happy:

Alexander A. Klimov <alexander.klimov@icinga.com> <al2klimov@gmail.com>

So I don't see a reason why this PR shouldn't just include it. Bypassing merge rules shouldn't become the norm.

@yhabteab
Copy link
Member Author

yhabteab commented Dec 1, 2025

Who else is missing?

There's also the dependabot user https://github.com/Icinga/icinga2/actions/runs/19765323465/job/56636585443 which requires the workaround in the authors-file workflows too.

@yhabteab
Copy link
Member Author

yhabteab commented Dec 1, 2025

Though actually nobody is missing here. This PR should just need the additional line added by d81607d to be happy:

Why isn't that commit part of the PR that actually introduced the naming change? I just didn't wanted to waste another GHA runs for such useless commit but fine I will backport that commit too.

@yhabteab yhabteab requested a review from julianbrost December 1, 2025 13:07
@julianbrost
Copy link
Member

Why did you include the following two PRs as well? I don't see how they are related to this at all.

These should have been backported the first there was a failed authors file check on the support/2.14 branch because a dependabot commit was backported instead of force-merging the PR. Can we please do this properly, i.e. now as a separate PR instead of sneaking it into another one?

@yhabteab yhabteab force-pushed the backport-10278-to-support/2.14 branch from 2d5287b to c3ccfa7 Compare December 1, 2025 13:33
@yhabteab yhabteab merged commit 528d272 into support/2.14 Dec 2, 2025
27 of 28 checks passed
@yhabteab yhabteab deleted the backport-10278-to-support/2.14 branch December 2, 2025 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants