admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

dev-cmd/bump-cask-pr: fix Linux cask bumping.

Browse Source 
- Remove check for `cask.depends_on.macos` as it seems to be always
  present and set to at least >=10.11
- When we've specified multiple architectures, allow casks to be invalid
  on some architectures.
This commit is contained in:
Mike McQuaid 2025-04-01 12:07:16 +01:00
parent 3f7c0854a3
commit 7250624b56
No known key found for this signature in database
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/dev-cmd/bump-cask-pr.rb
View File

@ -191,17 +191,22 @@ module Homebrew
} }
def replace_version_and_checksum(cask, new_hash, new_version, replacement_pairs) def replace_version_and_checksum(cask, new_hash, new_version, replacement_pairs)
# When blocks are absent, arch is not relevant. For consistency, we simulate the arm architecture. # When blocks are absent, arch is not relevant. For consistency, we simulate the arm architecture.
system_options = if !cask.on_system_blocks_exist? system_options = if cask.on_system_blocks_exist?
[[:macos, :arm]]
elsif cask.on_system_blocks_exist? && cask.depends_on.macos
[:macos].product(OnSystem::ARCH_OPTIONS)
else
OnSystem::BASE_OS_OPTIONS.product(OnSystem::ARCH_OPTIONS) OnSystem::BASE_OS_OPTIONS.product(OnSystem::ARCH_OPTIONS)
else
[[:macos, :arm]]
end end
system_options.each do |os, arch| system_options.each do |os, arch|
SimulateSystem.with(os:, arch:) do SimulateSystem.with(os:, arch:) do
old_cask = Cask::CaskLoader.load(cask.sourcefile_path) # Handle the cask being invalid for specific os/arch combinations
old_cask = begin
Cask::CaskLoader.load(cask.sourcefile_path)
rescue Cask::CaskInvalidError
raise unless cask.on_system_blocks_exist?
end
next if old_cask.nil?
old_version = old_cask.version old_version = old_cask.version
bump_version = new_version.send(arch) || new_version.general bump_version = new_version.send(arch) || new_version.general