Commit 44edd111 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix-cache-clear-windows' into 'master'

Fix cache clear windows

Closes #42487

See merge request gitlab-org/gitlab-ce!16740
parents 5462e2bb 44c2f802
...@@ -466,7 +466,7 @@ module Ci ...@@ -466,7 +466,7 @@ module Ci
if cache && project.jobs_cache_index if cache && project.jobs_cache_index
cache = cache.merge( cache = cache.merge(
key: "#{cache[:key]}:#{project.jobs_cache_index}") key: "#{cache[:key]}_#{project.jobs_cache_index}")
end end
[cache] [cache]
......
---
title: 'Fix cache clear bug withg using : on Windows'
merge_request: 16740
author:
type: fixed
...@@ -277,7 +277,7 @@ describe Ci::Build do ...@@ -277,7 +277,7 @@ describe Ci::Build do
allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(1) allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(1)
end 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 end
context 'when project does not have jobs_cache_index' do context 'when project does not have jobs_cache_index' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment