summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2019-12-28 19:16:00 +0100
committerder richter <der.richter@gmx.de>2019-12-28 21:10:08 +0100
commite2c6919da077fd62b8c7720e76dadcc8701ae84a (patch)
treef6da8e0f008c73e1837b1c69392089b95d4d4882 /.travis.yml
parent1571276d6439123f669204b2058ad4450e6b3236 (diff)
downloadmpv-e2c6919da077fd62b8c7720e76dadcc8701ae84a.tar.bz2
mpv-e2c6919da077fd62b8c7720e76dadcc8701ae84a.tar.xz
travis: fix python3 for macOS machines
python3 couldn't be set up as system default because it was blocked by the old python2.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 3ce2e72ad5..0689800277 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,11 @@ before_install:
- if [ "$TRAVIS_COMPILER" = "clang" ]; then export CXX="clang++"; fi
- if [ "$TRAVIS_COMPILER" = "gcc" ]; then export CXX="g++"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then docker pull $CONTAINER; fi
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then "$TRAVIS_BUILD_DIR/ci/get_ffmpeg.sh"; fi
+ - |
+ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+ brew link --overwrite python
+ "$TRAVIS_BUILD_DIR/ci/get_ffmpeg.sh"
+ fi
script:
- ./bootstrap.py
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then docker run --env CC --env TARGET -v $TRAVIS_BUILD_DIR:/build $CONTAINER /bin/sh -c "cd /build && $CI_SCRIPT"; fi
@@ -83,4 +87,5 @@ addons:
- luajit
- nasm
- pkg-config
+ - python
update: true