summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/build/policy/variables.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-03-23 13:44:12 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-03-23 13:44:12 +0100
commit8a2bc9b4457903dfdb0efc88c5ba816f4ba3141e (patch)
treeb2070a8ecb32449ecdb4a1bf7dc9c40afacee912 /lib/gitlab/ci/build/policy/variables.rb
parent96d6193cabacc92f43bd441f48d63b226d9dad21 (diff)
downloadgitlab-ce-8a2bc9b4457903dfdb0efc88c5ba816f4ba3141e.tar.gz
Integration variables collections with expressions
Diffstat (limited to 'lib/gitlab/ci/build/policy/variables.rb')
-rw-r--r--lib/gitlab/ci/build/policy/variables.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/ci/build/policy/variables.rb b/lib/gitlab/ci/build/policy/variables.rb
index ec6c64d9547..e5fec4469b3 100644
--- a/lib/gitlab/ci/build/policy/variables.rb
+++ b/lib/gitlab/ci/build/policy/variables.rb
@@ -8,9 +8,13 @@ module Gitlab
end
def satisfied_by?(pipeline, build)
+ variables = Gitlab::Ci::Variables::Collection
+ .new(build.simple_variables)
+ .to_hash
+
statements = @expressions.map do |statement|
::Gitlab::Ci::Pipeline::Expression::Statement
- .new(statement, pipeline)
+ .new(statement, variables)
end
statements.any?(&:truthful?)