Merge pull request #18296 from fxcoudert/sequoia_rc

Make Sequoia supported
This commit is contained in:
Mike McQuaid 2024-09-11 13:31:36 +01:00 committed by GitHub
commit b29549eaed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 9 deletions

View File

@ -25,7 +25,7 @@ jobs:
TEMPORARY_CERTIFICATE_FILE: 'homebrew_developer_id_installer_certificate.p12' TEMPORARY_CERTIFICATE_FILE: 'homebrew_developer_id_installer_certificate.p12'
TEMPORARY_KEYCHAIN_FILE: 'homebrew_installer_signing.keychain-db' TEMPORARY_KEYCHAIN_FILE: 'homebrew_installer_signing.keychain-db'
# Set to the oldest supported version of macOS # Set to the oldest supported version of macOS
HOMEBREW_MACOS_OLDEST_SUPPORTED: '12.0' HOMEBREW_MACOS_OLDEST_SUPPORTED: '13.0'
steps: steps:
- name: Remove existing API cache (to force update) - name: Remove existing API cache (to force update)
run: rm -rvf ~/Library/Caches/Homebrew/api run: rm -rvf ~/Library/Caches/Homebrew/api

View File

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

View File

@ -31,7 +31,8 @@ RSpec.describe Homebrew::DevCmd::DetermineTestRunners do
out = [] out = []
MacOSVersion::SYMBOLS.each_value do |v| MacOSVersion::SYMBOLS.each_value do |v|
macos_version = MacOSVersion.new(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}-x86_64"
out << "#{v}-arm64" out << "#{v}-arm64"

View File

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

View File

@ -9,7 +9,7 @@ The macOS `.pkg` installer also installs Homebrew to its default prefix (`/opt/h
## macOS Requirements ## macOS Requirements
* A 64-bit Intel CPU or Apple Silicon CPU <sup>[1](#1)</sup> * 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 * Command Line Tools (CLT) for Xcode (from `xcode-select --install` or
[https://developer.apple.com/download/all/](https://developer.apple.com/download/all/)) 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> [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="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/). <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/).

View File

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