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

bloaty: use unversioned protobuf #135589

Merged
merged 2 commits into from
Jul 2, 2023
Merged

Conversation

carlocab
Copy link
Member

@carlocab carlocab commented Jul 2, 2023

  • Have you followed the guidelines for contributing?
  • Have you ensured that your commits follow the commit style guide?
  • Have you checked that there aren't other open pull requests for the same formula update/change?
  • Have you built your formula locally with brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
  • Is your test running fine brew test <formula>, where <formula> is the name of the formula you're submitting?
  • Does your build pass brew audit --strict <formula> (after doing brew install --build-from-source <formula>)? If this is a new formula, does it pass brew audit --new <formula>?

Needed for #132437.

We need to apply a patch to avoid using the vendored abseil, which
will conflict with the one pulled in by our Protobuf.

Will upstream the patch if it works in CI.

@carlocab carlocab force-pushed the bloaty-protobuf branch 2 times, most recently from 7fcd460 to f8dd5f2 Compare July 2, 2023 14:05
@carlocab
Copy link
Member Author

carlocab commented Jul 2, 2023

Upstreamed at google/bloaty#347.

Needed for Homebrew#132437.

We need to apply a patch to avoid using the vendored `abseil`, which
will conflict with the one pulled in by our Protobuf.
@carlocab carlocab marked this pull request as ready for review July 2, 2023 14:14
@@ -1,7 +1,6 @@
class Bloaty < Formula
desc "Size profiler for binaries"
homepage "https://github.com/google/bloaty"
# TODO: Check if we can use unversioned `protobuf` at version bump
Copy link
Member Author

Choose a reason for hiding this comment

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

I've omitted the revision bump since this will likely get one in #132437 soon-ish.

@carlocab carlocab added the ready to merge PR can be merged once CI is green label Jul 2, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jul 2, 2023

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Jul 2, 2023
@BrewTestBot BrewTestBot added this pull request to the merge queue Jul 2, 2023
Merged via the queue into Homebrew:master with commit 7abcc7f Jul 2, 2023
12 checks passed
@carlocab carlocab deleted the bloaty-protobuf branch July 2, 2023 15:24
@github-actions github-actions bot added the outdated PR was locked due to age label Aug 2, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. outdated PR was locked due to age ready to merge PR can be merged once CI is green
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants