diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-09 17:43:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-10 00:03:28 +0200 |
| commit | 1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch) | |
| tree | ccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /.circleci | |
| parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
| parent | ac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 70d03f6b9..02b505457 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,7 @@ aliases: RAILS_ENV: test PARALLEL_TEST_PROCESSORS: 4 ALLOW_NOPAM: true + DISABLE_SIMPLECOV: true working_directory: ~/projects/mastodon/ - &attach_workspace @@ -90,7 +91,7 @@ aliases: command: ./bin/rails parallel:create parallel:load_schema parallel:prepare - run: name: Run Tests - command: bundle exec parallel_test ./spec/ --group-by filesize --type rspec + command: ./bin/retry bundle exec parallel_test ./spec/ --group-by filesize --type rspec jobs: install: @@ -150,7 +151,7 @@ jobs: - image: circleci/node:8.11.1-stretch steps: - *attach_workspace - - run: yarn test:jest + - run: ./bin/retry yarn test:jest check-i18n: <<: *defaults |