From 9d09c7cc68bdbf5f073251b0ced06580f74a75a7 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 30 Jul 2018 20:23:11 +0200
Subject: [PATCH] Use workspace instead of caching for built assets
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
---
.circleci/config.yml | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 95533f9a67..0567a3d334 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
@@ -128,11 +122,11 @@ jobs:
name: Precompile assets
command: ./bin/rails assets:precompile
no_output_timeout: 40m
- - 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