diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
| commit | 8ca91cef45417947607079118b1af07c9774ae58 (patch) | |
| tree | cafbe6cc30563ca35ffa522056ead63ca450d9c1 /.travis.yml | |
| parent | f2f2f1032082d6212771bd0307136484f671d37e (diff) | |
| parent | a0047fdca052088cce0e23c3b58b95f13be19805 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 5c2c2c889..777ca581c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,11 +27,14 @@ addons: apt: sources: - trusty-media + - sourceline: deb https://dl.yarnpkg.com/debian/ stable main + key_url: https://dl.yarnpkg.com/debian/pubkey.gpg packages: - ffmpeg + - libicu-dev - libprotobuf-dev - protobuf-compiler - - libicu-dev + - yarn rvm: - 2.3.4 @@ -42,7 +45,6 @@ services: install: - nvm install - - npm install -g yarn - bundle install --path=vendor/bundle --without development production --retry=3 --jobs=16 - yarn install |