Commit Graph

14 Commits (9b213f990da0b6f38318e83839888828945f9dfc)

Author SHA1 Message Date
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
2018-08-18 18:04:49 +02:00
ThibG 6852af1d03 Use CircleCI workflows for ruby dependencies (#8228)
* Add “bundle clean” suggestion from CircleCI doc

Cf. https://circleci.com/docs/2.0/caching/#bundler-ruby

* Use workspaces instead of caches for ruby gems

Cache are not guaranteed to be available, while the test jobs *require* their
depencies to run. Workspaces are thus more suitable.

One downside is that the order of workspace layer additions need to be
deterministic, which is why install-ruby{2.3,2.4} now depend on
install-ruby2.5.
2018-08-18 04:05:42 +02:00
Thibaut Girka 52165d0824 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.
2018-07-30 22:25:22 +02:00
ThibG 5c7a7176a3 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.
2018-07-30 22:22:55 +02:00
Thibaut Girka a41c54afac Double CircleCI's timeout for assets:precompile… 2018-07-27 10:38:46 +02:00
Thibaut Girka 107f4b89fb Increase timeout for assets:precompile 2018-07-18 21:20:30 +02:00
Renato "Lond" Cerqueira c0fbe9e3a4 Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)
This replace calls of String#match? with rails Regex#match?
This follows the same idea used to keep Rails 5.2 compatible with Ruby
2.2.2 in https://github.com/rails/rails/pull/32973
2018-07-03 19:47:09 +02:00
Yamagishi Kazutoshi d31b031214 Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447) 2018-05-11 11:51:07 +02:00
Yamagishi Kazutoshi e60292c616 Disable simplecov on CircleCI (#7416)
* Disable simplecov on CircleCI

* Remove --format progress
2018-05-09 16:59:58 +02:00
Yamagishi Kazutoshi 9d64bcdac7 Port travis_retry for CI (#7379)
* Port travis_retry for CI

* Add license
2018-05-06 10:55:50 +02:00
Yamagishi Kazutoshi 79fe092d0e Remove unnecessary hyphen from restore_cache key (#7276) 2018-04-28 11:20:30 +02:00
Yamagishi Kazutoshi 115bac8af9 Move precompile step to build stage (#7235) 2018-04-23 09:16:26 +02:00
Yamagishi Kazutoshi c461895933 Add parallel test processors (#7215) 2018-04-21 21:36:22 +02:00
Yamagishi Kazutoshi efa4eb4d13 Replace Travis to CircleCI (#7196) 2018-04-20 13:46:08 +02:00