diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml index 0c53d5107950802b321456e859fd6036917d377b_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..2e4714a2ceb373b0ae3413b64d102052d0f63688_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644 --- a/gitlab-ci-config/dev-gitlab-org.yml +++ b/gitlab-ci-config/dev-gitlab-org.yml @@ -32,7 +32,9 @@ - node_modules .branch-cache: - key: "${CI_JOB_NAME}-${BUILDER_IMAGE_REVISION}-${CACHE_EDITION}${CACHE_KEY_SUFFIX}" + key: "${CI_JOB_NAME}-${BUILDER_IMAGE_REVISION}-${CACHE_EDITION}${CACHE_KEY_SUFFIX}-${CI_COMMIT_REF_SLUG}" + fallback_keys: + - "${CI_JOB_NAME}-${BUILDER_IMAGE_REVISION}-${CACHE_EDITION}${CACHE_KEY_SUFFIX}-${CI_DEFAULT_BRANCH}" paths: !reference [.cache-paths] policy: $CACHE_POLICY diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml index 0c53d5107950802b321456e859fd6036917d377b_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..2e4714a2ceb373b0ae3413b64d102052d0f63688_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644 --- a/gitlab-ci-config/gitlab-com.yml +++ b/gitlab-ci-config/gitlab-com.yml @@ -86,8 +86,6 @@ junit: junit_rspec.xml .base-trigger-job-variables: - # In trigger jobs, we don't want to pollute cache - CACHE_POLICY: 'pull' ALTERNATIVE_SOURCES: 'true' SECURITY_SOURCES: ${SECURITY_SOURCES} BUILDER_IMAGE_REVISION: ${BUILDER_IMAGE_REVISION}