waveterm/homebrew-cask
0
0
Fork 0
mirror of https://github.com/wavetermdev/homebrew-cask.git synced 2026-08-05 13:43:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix depends_on macos: format compatibility

Browse Source
This commit is contained in:
Logicer
2021-07-21 11:15:25 +08:00
committed by Carlo Cabrera
parent 4bcc4b4ed6
commit cb64f58f42
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/lib/ci_matrix.rb
+5 -13
View File
@@ -15,17 +15,11 @@ module CiMatrix
def self.filter_runners(cask_content)
# Retrieve arguments from `depends_on macos:`
args = case cask_content
when /depends_on macos: \[((.*,?)*)\]/
Regexp.last_match(1).scan(/\s*"?(:[^\s",]+|(\d+\.\d+))"?,?\s*/).flatten.map do |val|
if /:(?<sym>\S+)/ =~ val
sym.to_sym
elsif /(?<ver>\d+\.\d+)/ =~ val
MacOS::Version.new(ver).to_sym
end
end
when /depends_on macos: \[((.*,?\s*)*)\]/
Regexp.last_match(1).scan(/\s*"?:([^\s",]+)"?,?\s*/).flatten.map(&:to_sym)
when /depends_on macos: "?:([^\s"]+)"?/
[*MacOS::Version.from_symbol(Regexp.last_match(1).to_sym)]
when /depends_on macos: "(([=<>]=\s)?(:\S+|(\d+\.\d+)))"/
[*Regexp.last_match(1).to_sym]
when /depends_on macos: "([=<>]=\s:?\S+)"/
[*Regexp.last_match(1)]
end
return RUNNERS if args.nil?
@@ -35,10 +29,8 @@ module CiMatrix
{ versions: args, comparator: "==" }
elsif MacOS::Version::SYMBOLS.key?(args.first)
{ versions: [args.first], comparator: "==" }
elsif /^\s*(?<comparator><|>|[=<>]=)\s*:(?<version>\S+)\s*$/ =~ args.first
elsif /^\s*(?<comparator><|>|[=<>]=)\s*:?(?<version>\S+)\s*$/ =~ args.first
{ versions: [version.to_sym], comparator: comparator }
elsif /^\s*(?<comparator><|>|[=<>]=)\s*(?<version>\S+)\s*$/ =~ args.first
{ versions: [version], comparator: comparator }
else # rubocop:disable Lint/DuplicateBranch
{ versions: [args.first], comparator: "==" }
end