Commit 65c2651e authored by Seb's avatar Seb
Browse files

Install ffmpeg before tests

parent fe0e8c37
......@@ -11,17 +11,14 @@ env:
- DJANGO_SETTINGS_MODULE="tests.app.settings"
- TOX_ENV=
matrix:
- DJANGO='18'
WAGTAIL='14'
- DJANGO='19'
WAGTAIL='14'
- DJANGO='18'
WAGTAIL='15'
- DJANGO='19'
WAGTAIL='15'
- DJANGO='18' WAGTAIL='14'
- DJANGO='19' WAGTAIL='14'
- DJANGO='18' WAGTAIL='15'
- DJANGO='19' WAGTAIL='15'
install:
- ./tests/scripts/install-ffmpeg.sh
- pip install --upgrade pip wheel tox
cache:
......
sudo add-apt-repository -y ppa:mc3man/trusty-media
sudo apt-get update
sudo apt-get install -y ffmpeg
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment