Big Sur cleanup

Remove `HOMEBREW_BIG_SUR_TESTING` variable as it is no longer needed.
This commit is contained in:
Mike McQuaid 2020-11-18 10:15:53 +00:00
parent f00e094884
commit 74264b8582
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
3 changed files with 1 additions and 8 deletions

View File

@ -6,7 +6,6 @@ on:
env: env:
HOMEBREW_DEVELOPER: 1 HOMEBREW_DEVELOPER: 1
HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_BIG_SUR_TESTING: 1 # TODO: remove when Big Sur is released.
jobs: jobs:
tests: tests:
if: github.repository == 'Homebrew/brew' if: github.repository == 'Homebrew/brew'

View File

@ -64,7 +64,6 @@ module Homebrew
ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic? ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic?
ENV["HOMEBREW_TEST_ONLINE"] = "1" if args.online? ENV["HOMEBREW_TEST_ONLINE"] = "1" if args.online?
ENV["HOMEBREW_SORBET_RUNTIME"] = "1" ENV["HOMEBREW_SORBET_RUNTIME"] = "1"
ENV["HOMEBREW_BIG_SUR_TESTING"] = "1"
ENV["USER"] ||= system_command!("id", args: ["-nu"]).stdout.chomp ENV["USER"] ||= system_command!("id", args: ["-nu"]).stdout.chomp

View File

@ -107,12 +107,7 @@ module Homebrew
return if Homebrew::EnvConfig.developer? return if Homebrew::EnvConfig.developer?
who = +"We" who = +"We"
# TODO: remove when Big Sur is supported. what = if OS::Mac.prerelease?
what = if MacOS.version == :big_sur
return if ENV["HOMEBREW_BIG_SUR_TESTING"]
"released but not yet supported version"
elsif OS::Mac.prerelease?
"pre-release version" "pre-release version"
elsif OS::Mac.outdated_release? elsif OS::Mac.outdated_release?
who << " (and Apple)" who << " (and Apple)"