diff options
| author | Nikolaus Rath <Nikolaus@rath.org> | 2018-03-31 12:58:37 +0100 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2018-03-31 13:26:15 +0100 |
| commit | 646a3c417bdb8d0e5bd60991469e7c9ae749901a (patch) | |
| tree | 2c515a2ed7186663c457d8b0d55ee0fdeb5cec86 | |
| parent | 303126bad91a536b4173ec3932aa312823729cbb (diff) | |
| download | sshfs-646a3c417bdb8d0e5bd60991469e7c9ae749901a.tar sshfs-646a3c417bdb8d0e5bd60991469e7c9ae749901a.tar.gz sshfs-646a3c417bdb8d0e5bd60991469e7c9ae749901a.tar.bz2 sshfs-646a3c417bdb8d0e5bd60991469e7c9ae749901a.zip | |
Fix Travis build environment.
Newest Meson requires Python 3.5.which isn't available in Trusty.
Pip version pin no longer necessary.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | test/travis-install.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 07b059a..42a0043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/test/travis-install.sh b/test/travis-install.sh index 478b385..9a46719 100755 --- a/test/travis-install.sh +++ b/test/travis-install.sh @@ -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 |