Skip to content

Omit platform for all bottles#22227

Merged
MikeMcQuaid merged 1 commit into
mainfrom
leave-manifest-platform-empty-for-all-bottles
May 11, 2026
Merged

Omit platform for all bottles#22227
MikeMcQuaid merged 1 commit into
mainfrom
leave-manifest-platform-empty-for-all-bottles

Conversation

@MikeMcQuaid
Copy link
Copy Markdown
Member

  • Avoid labelling :all OCI descriptors as platform-specific
  • Strip platform build fields from :all tab annotations
  • Cover the brew bottle --merge JSON that passes all onward
  • Cover GitHub Packages descriptors for all bottles

Closes #17395


  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them? Performance claims (e.g. "this is faster") must include Hyperfine benchmarks.
  • Have you written new tests (excluding integration tests) for your changes? Here's an example.
  • Have you successfully run brew lgtm (style, typechecking and tests) with your changes locally?

  • AI was used to generate or assist with generating this PR. Please specify below how you used AI to help you, and what steps you have taken to manually verify the changes. Non-maintainers may only have one AI-assisted/generated PR open at a time.

OpenAI Codex 5.5 with manual investigation, tweaking and review.


- Avoid labelling `:all` OCI descriptors as platform-specific
- Strip platform build fields from `:all` tab annotations
- Cover the `brew bottle --merge` JSON that passes `all` onward
- Cover GitHub Packages descriptors for `all` bottles
Copilot AI review requested due to automatic review settings May 11, 2026 07:45
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This pull request updates Homebrew’s GitHub Packages (OCI) bottle publishing to treat :all bottles as platform-agnostic by omitting OCI descriptor platform data and removing platform build fields from the embedded sh.brew.tab annotation. It also adds test coverage to ensure brew bottle --merge produces an all bottle JSON artifact and that GitHub Packages output matches the intended OCI behavior.

Changes:

  • Omit the OCI image index manifest platform field when uploading :all bottles.
  • Strip arch/built_on from the sh.brew.tab annotation for :all bottles.
  • Add RSpec coverage for both brew bottle --merge producing an all JSON and GitHub Packages’ all descriptor behavior.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
Library/Homebrew/github_packages.rb Drops platform for :all descriptors and removes platform build fields from the sh.brew.tab annotation; widens Sorbet types for schema validation/writers to allow symbol keys.
Library/Homebrew/test/github_packages_spec.rb New spec asserting :all descriptors omit platform and sh.brew.tab omits arch/built_on, while platform-specific bottles retain them.
Library/Homebrew/test/dev-cmd/bottle_spec.rb Adds coverage that brew bottle --merge writes an all bottle JSON and copies the all bottle file as expected.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@MikeMcQuaid MikeMcQuaid enabled auto-merge May 11, 2026 07:55
@MikeMcQuaid MikeMcQuaid added this pull request to the merge queue May 11, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 11, 2026
@MikeMcQuaid MikeMcQuaid added this pull request to the merge queue May 11, 2026
Merged via the queue into main with commit 138e3d0 May 11, 2026
41 checks passed
@MikeMcQuaid MikeMcQuaid deleted the leave-manifest-platform-empty-for-all-bottles branch May 11, 2026 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Leave manifest platform empty for :all bottles

3 participants