kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix change in behavior

Browse source
This commit is contained in:
Filip Krakowski 2017-06-05 17:15:15 +02:00 committed by Shinya Maeda
parent 7d16f698d5
commit 1736a2dab6
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ci/gitlab_ci_yaml_processor.rb
View file

@ -207,15 +207,19 @@ module Ci
def matching?(patterns, ref, tag, source)
patterns.any? do |pattern|
match_ref?(pattern, ref, tag) || match_source?(pattern, source)
pattern, path = pattern.split('@', 2)
match_path?(path) && match_pattern?(pattern, ref, tag, source)
end
end
def match_ref?(pattern, ref, tag)
pattern, path = pattern.split('@', 2)
return false if path && path != self.path
def match_path?(path)
return !(path && path != self.path)
end
def match_pattern?(pattern, ref, tag, source)
return true if tag && pattern == 'tags'
return true if !tag && pattern == 'branches'
return true if source_to_pattern(source) == pattern
if pattern.first == "/" && pattern.last == "/"
Regexp.new(pattern[1...-1]) =~ ref
@ -224,10 +228,6 @@ module Ci
end
end
def match_source?(pattern, source)
return source_to_pattern(source) == pattern
end
def source_to_pattern(source)
return source if %w(api external web).include?(source) || source.nil?
return source.pluralize