8000 Merge remote-tracking branch 'origin/master' · rutagoat/ffmpeg-python@7a44e54 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7a44e54

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 86eccbb + b73b312 commit 7a44e54

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: python
22
before_install:
33
- >
4-
[ -f ffmpeg-3.3.1-64bit-static/ffmpeg ] || (
5-
curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz &&
6-
tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz
4+
[ -f ffmpeg-release/ffmpeg ] || (
5+
curl -O https://johnvansickle.com/ffmpeg/releases/ 8C6D ffmpeg-release-64bit-static.tar.xz &&
6+
mkdir -p ffmpeg-release &&
7+
tar Jxf ffmpeg-release-64bit-static.tar.xz --strip-components=1 -C ffmpeg-release
78
)
89
matrix:
910
include:
@@ -28,9 +29,9 @@ matrix:
2829
install:
2930
- pip install tox
3031
script:
31-
- export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH
32+
- export PATH=$(readlink -f ffmpeg-release):$PATH
3233
- tox -e $TOX_ENV
3334
cache:
3435
directories:
3536
- .tox
36-
- ffmpeg-3.3.1-64bit-static
37+
- ffmpeg-release

0 commit comments

Comments
 (0)
0