From 0af5825dfbccd7b664f787826b396b897326554b Mon Sep 17 00:00:00 2001 From: Issy Long Date: Fri, 17 Mar 2023 22:56:50 +0000 Subject: [PATCH] rubocops/cask: `on_#{os_version}` is after [`version` & `sha256`] group - This still doesn't pass `brew readall` for Casks, but it gets us a little closer since if `url` has a `version` interpolated in it, the `version` stanza has to come first. - See https://github.com/Homebrew/homebrew-cask/pull/143201 for the current failures. --- Library/Homebrew/rubocops/cask/constants/stanza.rb | 2 +- .../fixtures/cask/Casks/with-depends-on-macos-failure.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/rubocops/cask/constants/stanza.rb b/Library/Homebrew/rubocops/cask/constants/stanza.rb index 0fff837f3f..5e589338b9 100644 --- a/Library/Homebrew/rubocops/cask/constants/stanza.rb +++ b/Library/Homebrew/rubocops/cask/constants/stanza.rb @@ -14,8 +14,8 @@ module RuboCop STANZA_GROUPS = [ [:arch, :on_arch_conditional], - ON_SYSTEM_METHODS_STANZA_ORDER, [:version, :sha256], + ON_SYSTEM_METHODS_STANZA_ORDER, [:language], [:url, :appcast, :name, :desc, :homepage], [:livecheck], diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb index f7d2061796..bbde7db9c3 100644 --- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb +++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-depends-on-macos-failure.rb @@ -2,9 +2,6 @@ cask "with-depends-on-macos-failure" do version "1.2.3" sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94" - url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" - homepage "https://brew.sh/with-depends-on-macos-failure" - # guarantee a mismatched release on_mojave :or_older do depends_on macos: :catalina @@ -16,5 +13,8 @@ cask "with-depends-on-macos-failure" do depends_on macos: :catalina end + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" + homepage "https://brew.sh/with-depends-on-macos-failure" + app "Caffeine.app" end