Fix regressions from deprecation commit #21012
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for faking the macOS version during Portable Ruby builds and fixes a bug in the version check for showing the Tigerbrew reference message.
- Added
HOMEBREW_FAKE_MACOSenvironment variable support to override macOS version detection - Fixed incorrect version comparison for displaying Tigerbrew error message (10.15.0 → 10.7.0)
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| Library/Homebrew/os/mac.rb | Adds HOMEBREW_FAKE_MACOS environment variable to override macOS version in full_version method for Portable Ruby building |
| Library/Homebrew/brew.sh | Corrects version threshold from 10.15.0 to 10.7.0 for showing Tigerbrew reference to users on macOS 10.4-10.6 |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
@Bo98 Can you elaborate (a lot) more on this? We're now building x86_64 Portable Ruby on Catalina, not El Capitan, no: https://github.com/Homebrew/homebrew-core/blob/c0788ac37fb31a692ae6c696323d64eb9d23dfc9/Formula/p/portable-ruby.rb#L18 Where is this variable set or used? There's no references in Homebrew/brew or Homebrew/homebrew-core and portable-ruby/test-bot were both moved into Homebrew/brew? |
|
It's not El Capitan specific. It applies to any type of cross building. The env is set and baked in the CI images themselves, in this case the 11-arm64-cross image. |
|
@Bo98 sorry, that was the question I guess: in what image(s) are we using this? Just for macOS Big Sur 11 ARM cross-compilation for Portable Ruby? Reading https://docs.brew.sh/Support-Tiers: am I correct in saying we'll need this until September 2027? |
|
As it stands yes, albeit that's pending testing if Node 24 still works on macOS 12 (which I'll do soon). |
Reverts small parts of c7c9c12.
The
HOMEBREW_FAKE_MACOSis needed for Portable Ruby building.Showing the 10.4-10.6 message to 10.7-10.15 also doesn't makes sense.
Alternative option for the latter is to just remove that message entirely.