Refactor Ci::Build#cache

1 files changed, 7 insertions, 4 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index ff903a63c54..d0ee08ab086 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -461,11 +461,14 @@ module Ci
     end
 
     def cache
-      if options[:cache] && project.jobs_cache_index
-        options[:cache].merge(key: "#{options[:cache][:key]}:#{project.jobs_cache_index}")
-      else
-        [options[:cache]]
+      cache = options[:cache]
+
+      if cache && project.jobs_cache_index
+        cache = cache.merge(
+          key: "#{cache[:key]}:#{project.jobs_cache_index}")
       end
+
+      [cache]
     end
 
     def credentials