From 889a4927849947ed9544bfb09a9aff616a1979c9 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Fri, 28 Dec 2018 10:07:05 +0700 Subject: [PATCH 1/2] travis: Use ninja from github --- .travis.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ad59d2b4..351979905 100644 --- a/.travis.yml +++ b/.travis.yml @@ -179,14 +179,17 @@ matrix: # meson dedicated test - name: Xenial (Meson + clang) + env: ALLOW_FAILURES=true dist: xenial language: cpp compiler: clang - before_install: + install: - sudo apt-get install -qq liblz4-dev valgrind tree - - curl -o ~/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' - - python3 ~/get-pip.py --user - - pip3 install --user meson ninja + - travis_retry curl -o ~/ninja.zip -L 'https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip' + && unzip ~/ninja.zip -d ~/.local/bin + - travis_retry curl -o ~/get-pip.py -L 'https://bootstrap.pypa.io/get-pip.py' + && python3 ~/get-pip.py --user + && pip3 install --user meson script: - meson --buildtype=debug -Db_lundef=false @@ -198,4 +201,4 @@ matrix: - DESTDIR=./staging ninja install - tree ./staging allow_failures: - - name: Xenial (Meson + clang) + - env: ALLOW_FAILURES=true From 142076ceae05138a6c1640f23731560ae3d69fcb Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Fri, 28 Dec 2018 11:55:26 +0700 Subject: [PATCH 2/2] travis: Remove deprecated sudo field --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 351979905..b3a654378 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: c dist: trusty -sudo: required git: depth: 1