From 9111fc9f30201e4719e6329b17feda38a6752cc1 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Tue, 12 Dec 2017 15:31:15 +0000 Subject: Revert "only install ffmpeg and mupdf on activestorage builds" This reverts commit 6ec0ed67d9afcc666ad0424b10e9903f63e60714. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.travis.yml') 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' -- cgit v1.2.3