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

Merge pull request #14190 from dawidd6/bump-favor-livecheckable

Browse Source 
dev-cmd/bump: don't use Repology version if livecheckable
This commit is contained in:
Dawid Dziurla 2022-12-05 16:00:56 +01:00 committed by GitHub
commit b8a505d0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/dev-cmd/bump.rb
View File

@ -207,9 +207,8 @@ module Homebrew
return "unable to get versions" if version_info.blank? return "unable to get versions" if version_info.blank?
latest = version_info[:latest] latest = version_info[:latest]
strategy = version_info[:meta][:strategy]
[Version.new(latest), strategy] Version.new(latest)
rescue => e rescue => e
"error: #{e}" "error: #{e}"
end end
@ -235,7 +234,7 @@ module Homebrew
version_name = "cask version " version_name = "cask version "
end end
livecheck_latest, livecheck_strategy = livecheck_result(formula_or_cask) livecheck_latest = livecheck_result(formula_or_cask)
repology_latest = if repositories.present? repology_latest = if repositories.present?
Repology.latest_version(repositories) Repology.latest_version(repositories)
@ -245,7 +244,7 @@ module Homebrew
new_version = if livecheck_latest.is_a?(Version) && livecheck_latest > current_version new_version = if livecheck_latest.is_a?(Version) && livecheck_latest > current_version
livecheck_latest livecheck_latest
elsif repology_latest.is_a?(Version) && repology_latest > current_version && livecheck_strategy != "GithubLatest" elsif repology_latest.is_a?(Version) && repology_latest > current_version && !formula_or_cask.livecheckable?
repology_latest repology_latest
end.presence end.presence
@ -273,9 +272,8 @@ module Homebrew
if repology_latest > current_version && if repology_latest > current_version &&
repology_latest > livecheck_latest && repology_latest > livecheck_latest &&
livecheck_strategy == "GithubLatest" formula_or_cask.livecheckable?
puts "#{title_name} was not bumped to the Repology version because that " \ puts "#{title_name} was not bumped to the Repology version because it's livecheckable."
"version is not the latest release on GitHub."
end end
return unless new_version return unless new_version