diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-09-07 21:00:52 +0200 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-09-07 21:00:52 +0200 |
commit | cd72189fc0127e9993eebaba9569f912394cc5c9 (patch) | |
tree | 374fc58900c287ca27dec6160aec56cf5d757ff6 /lib | |
parent | 5f33690ebbe19dd8698bf8b432a5e6740305f007 (diff) | |
download | gitlab-ce-cd72189fc0127e9993eebaba9569f912394cc5c9.tar.gz |
Import external files in Gitlab CI config
CE mirror of a10b777f8cb1902bba3964a4cbad2b1dd6bce785
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/config.rb | 11 | ||||
-rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb index 94b2fbc082b..f665ace7c74 100644 --- a/lib/gitlab/ci/config.rb +++ b/lib/gitlab/ci/config.rb @@ -6,12 +6,17 @@ module Gitlab class Config ConfigError = Class.new(StandardError) - def initialize(config, opts = {}) + def initialize(config, project = nil, opts = {}) initial_config = Config::Extendable .new(build_config(config, opts)) .to_hash - processor = ::Gitlab::Ci::ExternalFiles::Processor.new(initial_config) - @config = processor.perform + + if project.present? + processor = ::Gitlab::Ci::ExternalFiles::Processor.new(initial_config) + @config = processor.perform + else + @config = initial_config + end @global = Entry::Global.new(@config) @global.compose! diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index 5d1864ae9e2..702bcd3802d 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -7,8 +7,8 @@ module Gitlab attr_reader :cache, :stages, :jobs - def initialize(config, opts = {}) - @ci_config = Gitlab::Ci::Config.new(config, opts) + def initialize(config, project = nil, opts = {}) + @ci_config = Gitlab::Ci::Config.new(config, project, opts) @config = @ci_config.to_hash unless @ci_config.valid? |