Skip to content

GitLab

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

Install ffmpeg before tests

parent fe0e8c37
Hide whitespace changes
Inline Side-by-side
.travis.yml
View file @ 65c2651e
...@@ -11,17 +11,14 @@ env: ...@@ -11,17 +11,14 @@ env:
- DJANGO_SETTINGS_MODULE="tests.app.settings" - DJANGO_SETTINGS_MODULE="tests.app.settings"
- TOX_ENV= - TOX_ENV=
matrix: matrix:
- DJANGO='18' - DJANGO='18' WAGTAIL='14'
WAGTAIL='14' - DJANGO='19' WAGTAIL='14'
- DJANGO='19' - DJANGO='18' WAGTAIL='15'
WAGTAIL='14' - DJANGO='19' WAGTAIL='15'
- DJANGO='18'
WAGTAIL='15'
- DJANGO='19'
WAGTAIL='15'
install: install:
- ./tests/scripts/install-ffmpeg.sh
- pip install --upgrade pip wheel tox - pip install --upgrade pip wheel tox
cache: cache:
......
tests/scripts/install-ffmpeg.sh 0 → 100755
View file @ 65c2651e
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