From: ThibG Date: Mon, 30 Jul 2018 20:22:55 +0000 (+0200) Subject: Use workspace instead of caching for built assets (#8103) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d425d30804aeed41010452519b275bd007547377;p=mastodon.git Use workspace instead of caching for built assets (#8103) Tests cannot run without built assets, and we want exactly the matching assets. This is not a cache. --- diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a1c84253..ac8dfc334 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -81,12 +81,6 @@ aliases: - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version - *restore_ruby_dependencies - - restore_cache: - keys: - - precompiled-assets-{{ .Branch }}-{{ .Revision }} - - precompiled-assets-{{ .Branch }}- - - precompiled-assets- - - run: name: Prepare Tests command: ./bin/rails parallel:create parallel:load_schema parallel:prepare @@ -125,11 +119,11 @@ jobs: - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version - *restore_ruby_dependencies - run: ./bin/rails assets:precompile - - save_cache: - key: precompiled-assets-{{ .Branch }}-{{ .Revision }} + - persist_to_workspace: + root: ~/projects/ paths: - - ./public/assets - - ./public/packs-test/ + - ./mastodon/public/assets + - ./mastodon/public/packs-test/ test-ruby2.5: <<: *defaults