Merge pull request #20112 from Homebrew/add-newest-supported-env-var
Add HOMEBREW_MACOS_NEWEST_SUPPORTED env var
This commit is contained in:
		
						commit
						62ca1323df
					
				@ -614,6 +614,8 @@ esac
 | 
			
		||||
# and, if needed:
 | 
			
		||||
# - MacOSVersion::SYMBOLS
 | 
			
		||||
HOMEBREW_MACOS_NEWEST_UNSUPPORTED="16"
 | 
			
		||||
# TODO: bump version when new macOS is released
 | 
			
		||||
HOMEBREW_MACOS_NEWEST_SUPPORTED="15"
 | 
			
		||||
# 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
 | 
			
		||||
@ -841,6 +843,7 @@ export HOMEBREW_OS_VERSION
 | 
			
		||||
export HOMEBREW_MACOS_VERSION
 | 
			
		||||
export HOMEBREW_MACOS_VERSION_NUMERIC
 | 
			
		||||
export HOMEBREW_MACOS_NEWEST_UNSUPPORTED
 | 
			
		||||
export HOMEBREW_MACOS_NEWEST_SUPPORTED
 | 
			
		||||
export HOMEBREW_MACOS_OLDEST_SUPPORTED
 | 
			
		||||
export HOMEBREW_MACOS_OLDEST_ALLOWED
 | 
			
		||||
export HOMEBREW_USER_AGENT
 | 
			
		||||
 | 
			
		||||
@ -190,7 +190,7 @@ module Homebrew
 | 
			
		||||
      def generate_system_options(cask)
 | 
			
		||||
        current_os = Homebrew::SimulateSystem.current_os
 | 
			
		||||
        current_os_is_macos = MacOSVersion::SYMBOLS.include?(current_os)
 | 
			
		||||
        newest_macos = MacOSVersion::SYMBOLS.keys.first
 | 
			
		||||
        newest_macos = MacOSVersion.new(HOMEBREW_MACOS_NEWEST_SUPPORTED).to_sym
 | 
			
		||||
 | 
			
		||||
        depends_on_archs = cask.depends_on.arch&.filter_map { |arch| arch[:type] }&.uniq
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -45,7 +45,7 @@ module Homebrew
 | 
			
		||||
          Cask::Cask.generating_hash!
 | 
			
		||||
 | 
			
		||||
          all_casks = {}
 | 
			
		||||
          latest_macos = MacOSVersion.new((HOMEBREW_MACOS_NEWEST_UNSUPPORTED.to_i - 1).to_s).to_sym
 | 
			
		||||
          latest_macos = MacOSVersion.new(HOMEBREW_MACOS_NEWEST_SUPPORTED).to_sym
 | 
			
		||||
          Homebrew::SimulateSystem.with(os: latest_macos, arch: :arm) do
 | 
			
		||||
            tap.cask_files.each do |path|
 | 
			
		||||
              cask = Cask::CaskLoader.load(path)
 | 
			
		||||
 | 
			
		||||
@ -51,6 +51,7 @@ HOMEBREW_HOME_PLACEHOLDER = "/$HOME"
 | 
			
		||||
HOMEBREW_CASK_APPDIR_PLACEHOLDER = "$APPDIR"
 | 
			
		||||
 | 
			
		||||
HOMEBREW_MACOS_NEWEST_UNSUPPORTED = ENV.fetch("HOMEBREW_MACOS_NEWEST_UNSUPPORTED").freeze
 | 
			
		||||
HOMEBREW_MACOS_NEWEST_SUPPORTED = ENV.fetch("HOMEBREW_MACOS_NEWEST_SUPPORTED").freeze
 | 
			
		||||
HOMEBREW_MACOS_OLDEST_SUPPORTED = ENV.fetch("HOMEBREW_MACOS_OLDEST_SUPPORTED").freeze
 | 
			
		||||
HOMEBREW_MACOS_OLDEST_ALLOWED = ENV.fetch("HOMEBREW_MACOS_OLDEST_ALLOWED").freeze
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,7 @@ require "dev-cmd/bump-cask-pr"
 | 
			
		||||
RSpec.describe Homebrew::DevCmd::BumpCaskPr do
 | 
			
		||||
  subject(:bump_cask_pr) { described_class.new(["test"]) }
 | 
			
		||||
 | 
			
		||||
  let(:newest_macos) { MacOSVersion::SYMBOLS.keys.first }
 | 
			
		||||
  let(:newest_macos) { MacOSVersion.new(HOMEBREW_MACOS_NEWEST_SUPPORTED).to_sym }
 | 
			
		||||
 | 
			
		||||
  let(:c) do
 | 
			
		||||
    Cask::Cask.new("test") do
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user