diff options
author | Yasuo Honda <yasuo.honda@gmail.com> | 2017-12-12 15:31:15 +0000 |
---|---|---|
committer | Yasuo Honda <yasuo.honda@gmail.com> | 2017-12-12 15:31:15 +0000 |
commit | 9111fc9f30201e4719e6329b17feda38a6752cc1 (patch) | |
tree | 2191f7b89e3abbcda612a85dc7e36e502a3540d8 /.travis.yml | |
parent | e48704db8e6021b690b1fe2b362c7cb2e624e173 (diff) | |
download | rails-9111fc9f30201e4719e6329b17feda38a6752cc1.tar.gz rails-9111fc9f30201e4719e6329b17feda38a6752cc1.tar.bz2 rails-9111fc9f30201e4719e6329b17feda38a6752cc1.zip |
Revert "only install ffmpeg and mupdf on activestorage builds"
This reverts commit 6ec0ed67d9afcc666ad0424b10e9903f63e60714.
Diffstat (limited to '.travis.yml')
-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' |