diff options
| author | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
|---|---|---|
| committer | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
| commit | 7d2e6429c27c5ddc8ef3d2366c44329092e07f77 (patch) | |
| tree | 7cfd2035f69616a369b2f3762ce9cefe61c2bd22 /.circleci | |
| parent | f2ff167c1a8df9b2521d33fcca15b8d5c67c50b1 (diff) | |
| parent | e396fbfe3bf4d2a404e78e73cff1a609dd0a9bfb (diff) | |
Merge branch 'glitch' into thread-icon
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 70d03f6b9..8791965f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,8 @@ aliases: RAILS_ENV: test PARALLEL_TEST_PROCESSORS: 4 ALLOW_NOPAM: true + CONTINUOUS_INTEGRATION: true + DISABLE_SIMPLECOV: true working_directory: ~/projects/mastodon/ - &attach_workspace @@ -90,7 +92,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 +152,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 |