Skip to content

Commit

Permalink
Fix Travis build environment.
Browse files Browse the repository at this point in the history
Newest Meson requires Python 3.5.which isn't available in Trusty.
Pip version pin no longer necessary.
  • Loading branch information
Nikratio committed Mar 31, 2018
1 parent 303126b commit 646a3c4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ addons:
- gcc-6
- python-docutils
- python3-pip
before_install:
- sudo -H python3 -m pip install pip==8.1.1
install: test/travis-install.sh
script: test/travis-build.sh

3 changes: 2 additions & 1 deletion test/travis-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

set -e

sudo python3 -m pip install pytest meson
# Meson 0.45 requires Python 3.5 or newer
sudo python3 -m pip install pytest meson==0.44
wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
unzip ninja-linux.zip
chmod 755 ninja
Expand Down

0 comments on commit 646a3c4

Please sign in to comment.