Permalink
Browse files

Merge pull request #31418 from yahonda/revert_31339_to_address_31369

Revert "only install ffmpeg and mupdf on activestorage builds"
  • Loading branch information...
eileencodes committed Dec 12, 2017
2 parents ae76245 + 9111fc9 commit ec68e5d42d20befd85cdf22dd5d516b1adda7012
Showing with 4 additions and 1 deletion.
  1. +4 −1 .travis.yml
View
@@ -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'

0 comments on commit ec68e5d

Please sign in to comment.