Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Websites UFRPE
Wagtail Videos
Commits
00ba1871
Commit
00ba1871
authored
Jul 27, 2016
by
Seb
Browse files
Install ffmpeg in travis.yml not seperate script
parent
65c2651e
Changes
2
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
00ba1871
...
...
@@ -16,9 +16,12 @@ env:
-
DJANGO='18' WAGTAIL='15'
-
DJANGO='19' WAGTAIL='15'
before_install
:
-
sudo add-apt-repository ppa:mc3man/trusty-media -y
-
sudo apt-get update -q
-
sudo apt-get install ffmpeg -y
install
:
-
./tests/scripts/install-ffmpeg.sh
-
pip install --upgrade pip wheel tox
cache
:
...
...
tests/scripts/install-ffmpeg.sh
deleted
100755 → 0
View file @
65c2651e
sudo
add-apt-repository
-y
ppa:mc3man/trusty-media
sudo
apt-get update
sudo
apt-get
install
-y
ffmpeg
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment