Commit dc975525 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Merge branch 'ci-commit-as-pipeline' into with-pipeline-view

parents 21136baa 5117412e
...@@ -138,24 +138,29 @@ module Ci ...@@ -138,24 +138,29 @@ module Ci
def config_processor def config_processor
return nil unless ci_yaml_file return nil unless ci_yaml_file
@config_processor ||= Ci::GitlabCiYamlProcessor.new(ci_yaml_file, project.path_with_namespace) return @config_processor if defined?(@config_processor)
rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
save_yaml_error(e.message) @config_processor ||= begin
nil Ci::GitlabCiYamlProcessor.new(ci_yaml_file, project.path_with_namespace)
rescue rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
save_yaml_error("Undefined error") save_yaml_error(e.message)
nil nil
rescue
save_yaml_error("Undefined error")
nil
end
end end
def ci_yaml_file def ci_yaml_file
return nil if defined?(@ci_yaml_file) return @ci_yaml_file if defined?(@ci_yaml_file)
@ci_yaml_file ||= begin @ci_yaml_file ||= begin
blob = project.repository.blob_at(sha, '.gitlab-ci.yml') blob = project.repository.blob_at(sha, '.gitlab-ci.yml')
blob.load_all_data!(project.repository) blob.load_all_data!(project.repository)
blob.data blob.data
rescue
nil
end end
rescue
nil
end end
def skip_ci? def skip_ci?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment