summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMek Stittri <mstittri@gitlab.com>2019-02-08 00:27:21 +0000
committerMek Stittri <mstittri@gitlab.com>2019-02-08 00:27:21 +0000
commit3cd77ed3fe846f07eff60c6e02419c5d3cd616e8 (patch)
treebe213a36b6bf6f85c7ce9dede4182bbcb32cfcd9
parent2d70977aced471c4e602fb9cd3257c93d645f152 (diff)
parent7e5c2d23dd430acd04b24d5fa2f59b362b31c1bc (diff)
downloadgitlab-ce-3cd77ed3fe846f07eff60c6e02419c5d3cd616e8.tar.gz
Merge branch 'leipert-disable-sprocket-caching' into 'master'
Disable caching for sprockets for now See merge request gitlab-org/gitlab-ce!25025
-rw-r--r--.gitlab-ci.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c14fb0c2028..4e8453726a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -388,11 +388,13 @@ flaky-examples-check:
.assets-compile-cache: &assets-compile-cache
cache:
- key: "assets-compile:vendor_ruby:.yarn-cache:tmp_cache_assets_sprockets:v3"
+ key: "assets-compile:vendor_ruby:.yarn-cache:tmp_cache_assets_sprockets:v4"
paths:
- vendor/ruby/
- .yarn-cache/
- - tmp/cache/assets/sprockets
+ # We have disabled caching of sprockets for now, as it fails to pick up changes in SCSS:
+ # https://gitlab.com/gitlab-org/gitlab-ce/issues/57431
+ # - tmp/cache/assets/sprockets
compile-assets:
<<: *dedicated-runner