diff options
author | ThibG <thib@sitedethib.com> | 2018-05-10 00:28:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-10 00:28:54 +0200 |
commit | 34142ab29c33104793afe3199f102d84b83b9b57 (patch) | |
tree | afba23a3f169d7445f80ffe555985a295c98f6e1 /.circleci/config.yml | |
parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
parent | 5d8052e7156c913a551b923c51d508b1ea8837b3 (diff) |
Merge pull request #472 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to '.circleci/config.yml')
-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 |