Skip to content
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

Support Ubuntu 24.04 out of the box (fixes #261)… while keeping support for more recent Protobuf intact #263

Conversation

hartwork
Copy link
Contributor

@hartwork hartwork commented Feb 5, 2025

Fixes #261

CC @vitalybuka

Effectly makes change "Switch to requires_utf8_validation"
(commit de82ae3) conditional
with regard to target Protobuf version.

Signed-off-by: Sebastian Pipping <[email protected]>
Effectly reverts these two changes:

- 'Replace DebugString with absl::StrCat'
  (commit 7aed2ed3f4eec486e16c3fb381157ef7a9e172bb)
- 'Revert "Switch from StrCat to ShortFormat"'
  (commit b1736a68e5dfdf95dd36964fa87ecd13050318a1)

@vitalybuka confirmed that preprocessor conditionals a la ..

> #if PROTOBUF_VERSION >= 4024000  // v3(!).24.0 (commit a6d895988dee9586b1689259f4412d1714ea1e53) for ShortFormat
>     ..
> #else
>     ..
> #endif

.. are not necessary here, so a simpler approach was possible.

Signed-off-by: Sebastian Pipping <[email protected]>
.. to what GitHub Actions was already doing, effectively.

Signed-off-by: Sebastian Pipping <[email protected]>
@vitalybuka vitalybuka merged commit 9871342 into google:master Feb 7, 2025
5 checks passed
@hartwork
Copy link
Contributor Author

hartwork commented Feb 7, 2025

@vitalybuka thank you! 🎉

@hartwork hartwork deleted the issue-261-support-ubuntu-24-04-out-of-the-box branch February 7, 2025 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants