From 7687ae3891f8d919eeaeb0eb8a73f84ce4ec29b7 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Mon, 17 Mar 2025 11:58:00 +0100 Subject: [PATCH 1/2] feat: add linux support to bump-cask-pr --- Library/Homebrew/dev-cmd/bump-cask-pr.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb index a46968cf83..6b8f86167a 100644 --- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb @@ -191,9 +191,16 @@ module Homebrew } 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. - arch_options = cask.on_system_blocks_exist? ? OnSystem::ARCH_OPTIONS : [:arm] - arch_options.each do |arch| - SimulateSystem.with(arch:) do + system_options = if !cask.on_system_blocks_exist? + [:macos, :arm] + elsif cask.on_system_blocks_exist? && cask.os.nil? + [:macos].product(OnSystem::ARCH_OPTIONS) + else + OnSystem::BASE_OS_OPTIONS.product(OnSystem::ARCH_OPTIONS) : + end + + system_options.each do |os, arch| + SimulateSystem.with(os:, arch:) do old_cask = Cask::CaskLoader.load(cask.sourcefile_path) old_version = old_cask.version bump_version = new_version.send(arch) || new_version.general From 4f7e45881d01bc1674fd8c2000271fa617f39263 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Mon, 17 Mar 2025 11:58:00 +0100 Subject: [PATCH 2/2] feat: add linux support to bump-cask-pr --- Library/Homebrew/dev-cmd/bump-cask-pr.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb index 6b8f86167a..cbc0f89989 100644 --- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb @@ -192,11 +192,11 @@ module Homebrew 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. system_options = if !cask.on_system_blocks_exist? - [:macos, :arm] - elsif cask.on_system_blocks_exist? && cask.os.nil? + [[: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) end system_options.each do |os, arch|