diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-12-12 10:41:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 10:41:48 -0500 |
| commit | ec68e5d42d20befd85cdf22dd5d516b1adda7012 (patch) | |
| tree | dbb27d08a8749624512b3783e477ed2307c43319 | |
| parent | ae7624571bf28484639c10b67ea32191343a5645 (diff) | |
| parent | 9111fc9f30201e4719e6329b17feda38a6752cc1 (diff) | |
| download | rails-ec68e5d42d20befd85cdf22dd5d516b1adda7012.tar.gz rails-ec68e5d42d20befd85cdf22dd5d516b1adda7012.tar.bz2 rails-ec68e5d42d20befd85cdf22dd5d516b1adda7012.zip | |
Merge pull request #31418 from yahonda/revert_31339_to_address_31369
Revert "only install ffmpeg and mupdf on activestorage builds"
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ac151b902d..be41734a57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,10 @@ addons: sources: - sourceline: "ppa:mc3man/trusty-media" - sourceline: "ppa:ubuntuhandbook1/apps" + packages: + - ffmpeg + - mupdf + - mupdf-tools bundler_args: --without test --jobs 3 --retry 3 before_install: @@ -38,7 +42,6 @@ before_script: # Decodes to e.g. `export VARIABLE=VALUE` - $(base64 --decode <<< "ZXhwb3J0IFNBVUNFX0FDQ0VTU19LRVk9YTAzNTM0M2YtZTkyMi00MGIzLWFhM2MtMDZiM2VhNjM1YzQ4") - $(base64 --decode <<< "ZXhwb3J0IFNBVUNFX1VTRVJOQU1FPXJ1YnlvbnJhaWxz") - - if [[ $GEM = *ast* ]] ; then sudo apt-get update && sudo apt-get -y install ffmpeg mupdf mupdf-tools ; fi script: 'ci/travis.rb' |