From 26b61a2d0939ed690df27730515cf4aaf2240a4d Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 23 Jan 2019 19:32:27 +0100 Subject: [PATCH] We do not need the exact version 0.43.0 for meson. --- .travis.yml | 1 + travis/install_deps.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 612a3099c..bf09f8c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ addons: apt: packages: - cmake + - python3.5 - python3-pip - libbz2-dev - ccache diff --git a/travis/install_deps.sh b/travis/install_deps.sh index 7687d07b7..9c30e6a65 100755 --- a/travis/install_deps.sh +++ b/travis/install_deps.sh @@ -9,12 +9,16 @@ ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz cd $HOME if [[ "$TRAVIS_OS_NAME" == "osx" ]] then - pip3 install meson==0.43.0 + pip3 install meson wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip unzip ninja-mac.zip ninja else - pip3 install --user meson==0.43.0 + wget https://bootstrap.pypa.io/get-pip.py + python3.5 get-pip.py --user + + python3.5 -m pip install --user --upgrade pip + python3.5 -m pip install --user meson wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip unzip ninja-linux.zip ninja