We do not need the exact version 0.43.0 for meson.

This commit is contained in:
Matthieu Gautier 2019-01-23 19:32:27 +01:00
parent aab88c9022
commit 26b61a2d09
2 changed files with 7 additions and 2 deletions

View File

@ -18,6 +18,7 @@ addons:
apt: apt:
packages: packages:
- cmake - cmake
- python3.5
- python3-pip - python3-pip
- libbz2-dev - libbz2-dev
- ccache - ccache

View File

@ -9,12 +9,16 @@ ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
cd $HOME cd $HOME
if [[ "$TRAVIS_OS_NAME" == "osx" ]] if [[ "$TRAVIS_OS_NAME" == "osx" ]]
then 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 wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip
unzip ninja-mac.zip ninja unzip ninja-mac.zip ninja
else 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 wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
unzip ninja-linux.zip ninja unzip ninja-linux.zip ninja