From 39741f49c3972eccf13023421d8eb85b54176132 Mon Sep 17 00:00:00 2001 From: Karl Kroening <karlk@kralnet.us> Date: Wed, 1 Nov 2017 00:25:21 -0700 Subject: [PATCH] travis: use generic directory name for ffmpeg --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65590ea..fd23c17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: python before_install: - > - [ -f ffmpeg-3.3.4-64bit-static/ffmpeg ] || ( + [ -f ffmpeg-release/ffmpeg ] || ( curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz && - tar Jxf ffmpeg-release-64bit-static.tar.xz + mkdir -p ffmpeg-release && + tar Jxf ffmpeg-release-64bit-static.tar.xz --strip-components=1 -C ffmpeg-release ) matrix: include: @@ -28,9 +29,9 @@ matrix: install: - pip install tox script: - - export PATH=$(readlink -f ffmpeg-3.3.4-64bit-static):$PATH + - export PATH=$(readlink -f ffmpeg-release):$PATH - tox -e $TOX_ENV cache: directories: - .tox - - ffmpeg-3.3.4-64bit-static + - ffmpeg-release