diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 21:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 21:09:05 +0300 |
| commit | 883d5720994852248f18cb3053dc9f053f28d6f9 (patch) | |
| tree | 409c976ddc659f34afaae3b2e97f1d0325f6455c /app/models/ci | |
| parent | 5e97da08cba997aefba6f6d13850f95536a80477 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index d5b9c338e39..111d2797fed 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -884,8 +884,9 @@ module Ci return cache unless project.ci_separated_caches - type_suffix = pipeline.protected_ref? ? 'protected' : 'non_protected' cache.map do |entry| + type_suffix = !entry[:unprotect] && pipeline.protected_ref? ? 'protected' : 'non_protected' + entry.merge(key: "#{entry[:key]}-#{type_suffix}") end end |