Merge pull request #18296 from fxcoudert/sequoia_rc

Make Sequoia supported
Homebrew · Sep 11, 2024 · b29549e · b29549e
2 parents 057ee66 + c51bb19
commit b29549e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/pkg-installer.yml b/.github/workflows/pkg-installer.yml
@@ -25,7 +25,7 @@ jobs:
       TEMPORARY_CERTIFICATE_FILE: 'homebrew_developer_id_installer_certificate.p12'
       TEMPORARY_KEYCHAIN_FILE: 'homebrew_installer_signing.keychain-db'
       # Set to the oldest supported version of macOS
-      HOMEBREW_MACOS_OLDEST_SUPPORTED: '12.0'
+      HOMEBREW_MACOS_OLDEST_SUPPORTED: '13.0'
     steps:
       - name: Remove existing API cache (to force update)
         run: rm -rvf ~/Library/Caches/Homebrew/api

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
@@ -516,13 +516,13 @@ esac
 # - https://github.com/Homebrew/install/blob/HEAD/install.sh
 # and, if needed:
 # - MacOSVersion::SYMBOLS
-HOMEBREW_MACOS_NEWEST_UNSUPPORTED="15"
+HOMEBREW_MACOS_NEWEST_UNSUPPORTED="16"
 # TODO: bump version when new macOS is released and update references in:
 # - docs/Installation.md
 # - HOMEBREW_MACOS_OLDEST_SUPPORTED in .github/workflows/pkg-installer.yml
 # - `os-version min` in package/Distribution.xml
 # - https://github.com/Homebrew/install/blob/HEAD/install.sh
-HOMEBREW_MACOS_OLDEST_SUPPORTED="12"
+HOMEBREW_MACOS_OLDEST_SUPPORTED="13"
 HOMEBREW_MACOS_OLDEST_ALLOWED="10.11"
 
 if [[ -n "${HOMEBREW_MACOS}" ]]

diff --git a/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb b/Library/Homebrew/test/dev-cmd/determine-test-runners_spec.rb
@@ -31,7 +31,8 @@ def get_runners(file)
     out = []
     MacOSVersion::SYMBOLS.each_value do |v|
       macos_version = MacOSVersion.new(v)
-      next if macos_version.unsupported_release?
+      next if macos_version < :monterey
+      next if macos_version > :sonoma
 
       out << "#{v}-x86_64"
       out << "#{v}-arm64"

diff --git a/Library/Homebrew/test/github_runner_matrix_spec.rb b/Library/Homebrew/test/github_runner_matrix_spec.rb
@@ -11,8 +11,9 @@
     allow(ENV).to receive(:fetch).with("GITHUB_RUN_ID").and_return("12345")
   end
 
+  # FIXME: Avoid changing this every time we change Homebrew/core CI runner macOS versions.
   let(:newest_supported_macos) do
-    MacOSVersion::SYMBOLS.find { |_, v| !MacOSVersion.new(v).prerelease? }
+    MacOSVersion::SYMBOLS.find { |k, _| k == :sonoma }
   end
 
   let(:testball) { TestRunnerFormula.new(Testball.new) }

diff --git a/docs/Installation.md b/docs/Installation.md
@@ -9,7 +9,7 @@ The macOS `.pkg` installer also installs Homebrew to its default prefix (`/opt/h
 ## macOS Requirements
 
 * A 64-bit Intel CPU or Apple Silicon CPU <sup>[1](#1)</sup>
-* macOS Monterey (12) (or higher) <sup>[2](#2)</sup>
+* macOS Ventura (13) (or higher) <sup>[2](#2)</sup>
 * Command Line Tools (CLT) for Xcode (from `xcode-select --install` or
   [https://developer.apple.com/download/all/](https://developer.apple.com/download/all/)) or
   [Xcode](https://itunes.apple.com/us/app/xcode/id497799835) <sup>[3](#3)</sup>
@@ -94,7 +94,7 @@ Uninstallation is documented in the [FAQ](FAQ.md#how-do-i-uninstall-homebrew).
 
 <a data-proofer-ignore name="1"><sup>1</sup></a> For 32-bit or PPC support see [Tigerbrew](https://github.com/mistydemeo/tigerbrew).
 
-<a data-proofer-ignore name="2"><sup>2</sup></a> macOS 12 (Monterey) or higher is best and supported, 10.11 (El Capitan) – 11 (Big Sur) are unsupported but may work and 10.10 (Yosemite) and older will not run Homebrew at all. For 10.4 (Tiger) – 10.6 (Snow Leopard) see [Tigerbrew](https://github.com/mistydemeo/tigerbrew).
+<a data-proofer-ignore name="2"><sup>2</sup></a> macOS 13 (Ventura) or higher is best and supported, 10.11 (El Capitan) – 12 (Monterey) are unsupported but may work and 10.10 (Yosemite) and older will not run Homebrew at all. For 10.4 (Tiger) – 10.6 (Snow Leopard) see [Tigerbrew](https://github.com/mistydemeo/tigerbrew).
 
 <a data-proofer-ignore name="3"><sup>3</sup></a> You may need to install Xcode, the CLT, or both depending on the formula, to install a bottle (binary package) which is the only supported configuration. Downloading Xcode may require an Apple Developer account on older versions of Mac OS X. Sign up for free at [Apple's website](https://developer.apple.com/account/).
 

diff --git a/package/Distribution.xml b/package/Distribution.xml
@@ -4,7 +4,7 @@
   <options customize="never" hostArchitectures="x86_64,arm64" rootVolumeOnly="true"/>
   <volume-check>
     <allowed-os-versions>
-        <os-version min="12.0.0"/>
+        <os-version min="13.0.0"/>
     </allowed-os-versions>
   </volume-check>
   <choices-outline>
@@ -27,7 +27,7 @@
   <license file="LICENSE.rtf"/>
   <conclusion file="CONCLUSION.rtf" />
   <allowed-os-versions>
-    <os-version min="12.0.0"/>
+    <os-version min="13.0.0"/>
   </allowed-os-versions>
 
   <script>