diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-19 15:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-19 15:17:14 +0000 |
| commit | 1445ba17033cdfdd21d0999f65267754af6344af (patch) | |
| tree | 4919ecd746c8dec4be33af47d83f11cec098cf69 /.travis.yml | |
| parent | 3d033a468748338b6036cb24bb00ea4e88656ae6 (diff) | |
| parent | 66105929e07fc7ddbdb8b66696b9ce1ed5d25957 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2aa647e9a..8a0931c26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ env: - LOCAL_HTTPS=true - RAILS_ENV=test - PARALLEL_TEST_PROCESSORS=2 - - "PATH=$HOME:$PATH" addons: postgresql: 9.4 @@ -49,7 +48,6 @@ install: before_script: - ./bin/rails parallel:create parallel:load_schema parallel:prepare assets:precompile - - ln -s /usr/bin/x86_64-linux-gnu-g++-6 "$HOME/g++" script: - travis_retry bundle exec parallel_test spec/ --group-by filesize --type rspec |