|
|
|
@ -3,7 +3,7 @@ version: 2 |
|
|
|
|
aliases: |
|
|
|
|
- &defaults |
|
|
|
|
docker: |
|
|
|
|
- image: circleci/ruby:2.6-buster-node |
|
|
|
|
- image: circleci/ruby:2.7-buster-node |
|
|
|
|
environment: &ruby_environment |
|
|
|
|
BUNDLE_APP_CONFIG: ./.bundle/ |
|
|
|
|
DB_HOST: localhost |
|
|
|
@ -98,8 +98,15 @@ jobs: |
|
|
|
|
<<: *defaults |
|
|
|
|
<<: *install_steps |
|
|
|
|
|
|
|
|
|
install-ruby2.7: |
|
|
|
|
<<: *defaults |
|
|
|
|
<<: *install_ruby_dependencies |
|
|
|
|
|
|
|
|
|
install-ruby2.6: |
|
|
|
|
<<: *defaults |
|
|
|
|
docker: |
|
|
|
|
- image: circleci/ruby:2.6-buster-node |
|
|
|
|
environment: *ruby_environment |
|
|
|
|
<<: *install_ruby_dependencies |
|
|
|
|
|
|
|
|
|
install-ruby2.5: |
|
|
|
@ -128,6 +135,17 @@ jobs: |
|
|
|
|
- ./mastodon/public/assets |
|
|
|
|
- ./mastodon/public/packs-test/ |
|
|
|
|
|
|
|
|
|
test-ruby2.7: |
|
|
|
|
<<: *defaults |
|
|
|
|
docker: |
|
|
|
|
- image: circleci/ruby:2.7-buster-node |
|
|
|
|
environment: *ruby_environment |
|
|
|
|
- image: circleci/postgres:10.6-alpine |
|
|
|
|
environment: |
|
|
|
|
POSTGRES_USER: root |
|
|
|
|
- image: circleci/redis:5-alpine |
|
|
|
|
<<: *test_steps |
|
|
|
|
|
|
|
|
|
test-ruby2.6: |
|
|
|
|
<<: *defaults |
|
|
|
|
docker: |
|
|
|
@ -184,20 +202,28 @@ workflows: |
|
|
|
|
build-and-test: |
|
|
|
|
jobs: |
|
|
|
|
- install |
|
|
|
|
- install-ruby2.7: |
|
|
|
|
requires: |
|
|
|
|
- install |
|
|
|
|
- install-ruby2.6: |
|
|
|
|
requires: |
|
|
|
|
- install |
|
|
|
|
- install-ruby2.7 |
|
|
|
|
- install-ruby2.5: |
|
|
|
|
requires: |
|
|
|
|
- install |
|
|
|
|
- install-ruby2.6 |
|
|
|
|
- install-ruby2.7 |
|
|
|
|
- install-ruby2.4: |
|
|
|
|
requires: |
|
|
|
|
- install |
|
|
|
|
- install-ruby2.6 |
|
|
|
|
- install-ruby2.7 |
|
|
|
|
- build: |
|
|
|
|
requires: |
|
|
|
|
- install-ruby2.6 |
|
|
|
|
- install-ruby2.7 |
|
|
|
|
- test-ruby2.7: |
|
|
|
|
requires: |
|
|
|
|
- install-ruby2.7 |
|
|
|
|
- build |
|
|
|
|
- test-ruby2.6: |
|
|
|
|
requires: |
|
|
|
|
- install-ruby2.6 |
|
|
|
@ -215,4 +241,4 @@ workflows: |
|
|
|
|
- install |
|
|
|
|
- check-i18n: |
|
|
|
|
requires: |
|
|
|
|
- install-ruby2.6 |
|
|
|
|
- install-ruby2.7 |
|
|
|
|