diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2018-04-22 04:36:22 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-21 21:36:22 +0200 |
| commit | b8f0cfd6e34bc1285e952072a8c8a0eeafd8918c (patch) | |
| tree | 2e4704c988e516c118fdd85451556ca9faff84be | |
| parent | a4a36d994b0949aff134a2c1ba4efc361b7fb358 (diff) | |
Add parallel test processors (#7215)
| -rw-r--r-- | .circleci/config.yml | 7 | ||||
| -rw-r--r-- | .env.test | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index e3a9628acfd..c5d6ec9d12d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,13 +6,10 @@ aliases: - image: circleci/ruby:2.5.1-stretch-node environment: &ruby_environment BUNDLE_APP_CONFIG: ./.bundle/ - RAILS_ENV: test - NODE_ENV: test DB_HOST: localhost DB_USER: root - LOCAL_DOMAIN: cb6e6126.ngrok.io - LOCAL_HTTPS: true - PARALLEL_TEST_PROCESSORS: 2 + RAILS_ENV: test + PARALLEL_TEST_PROCESSORS: 4 ALLOW_NOPAM: true working_directory: ~/projects/mastodon/ diff --git a/.env.test b/.env.test index 7da76f8ef88..726351c5e35 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,5 @@ +# Node.js +NODE_ENV=test # Federation LOCAL_DOMAIN=cb6e6126.ngrok.io LOCAL_HTTPS=true |