Refactor Ci::Build#cache

2018-01-04 19:43:31 +01:00 · 2018-01-04 19:43:31 +01:00 · 2682966829
commit 2682966829
parent 8cc14dd537
1 changed files with 7 additions and 4 deletions
--- 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