Commit Graph

14 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author SHA1 Message Date
Thibaut Girka bfeac6747a 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.
7 years ago
ThibG 5059989cc7 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.
7 years ago
Thibaut Girka 9d09c7cc68 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.
7 years ago
ThibG d425d30804 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.
7 years ago
Thibaut Girka 3fa9bf7cc2 Double CircleCI's timeout for assets:precompile… 7 years ago
Thibaut Girka f328d20ff8 Increase timeout for assets:precompile 7 years ago
Renato "Lond" Cerqueira 4045b50bd6 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
7 years ago
Yamagishi Kazutoshi 1337ca837b Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447) 7 years ago
Yamagishi Kazutoshi ac788ad47e Disable simplecov on CircleCI (#7416)
* Disable simplecov on CircleCI

* Remove --format progress
7 years ago
Yamagishi Kazutoshi 8c35d163a5 Port travis_retry for CI (#7379)
* Port travis_retry for CI

* Add license
7 years ago
Yamagishi Kazutoshi 1c3ace23cb Remove unnecessary hyphen from restore_cache key (#7276) 7 years ago
Yamagishi Kazutoshi 3bf6da1ffc Move precompile step to build stage (#7235) 7 years ago
Yamagishi Kazutoshi b8f0cfd6e3 Add parallel test processors (#7215) 7 years ago
Yamagishi Kazutoshi 6f63cbb53c Replace Travis to CircleCI (#7196) 7 years ago