Merge branch '43373-fix-cache-index-appending' into 'master'
Resolve "cache key for CI stopped working" Closes #43373 See merge request gitlab-org/gitlab-ce!17260
This commit is contained in:
commit
6ce56d45ef
|
@ -467,7 +467,7 @@ module Ci
|
|||
|
||||
if cache && project.jobs_cache_index
|
||||
cache = cache.merge(
|
||||
key: "#{cache[:key]}_#{project.jobs_cache_index}")
|
||||
key: "#{cache[:key]}-#{project.jobs_cache_index}")
|
||||
end
|
||||
|
||||
[cache]
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix issue with cache key being empty when variable used as the key
|
||||
merge_request: 17260
|
||||
author:
|
||||
type: fixed
|
|
@ -277,7 +277,7 @@ describe Ci::Build do
|
|||
allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(1)
|
||||
end
|
||||
|
||||
it { is_expected.to be_an(Array).and all(include(key: "key_1")) }
|
||||
it { is_expected.to be_an(Array).and all(include(key: "key-1")) }
|
||||
end
|
||||
|
||||
context 'when project does not have jobs_cache_index' do
|
||||
|
|
Loading…
Reference in New Issue