X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=23cb24fac161222a3fe5ad6c69a47e9dffec0708;hb=fbb969b98a4aeb8ada493c7e86b70d9fa8f5a9c1;hp=770ba8dbc2dcaa3d6087fa10b8c6712a95458d1a;hpb=64ffc289be897d25a2e6038c2bcf17dc0608fcea;p=mesa.git diff --git a/.travis.yml b/.travis.yml index 770ba8dbc2d..23cb24fac16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,10 @@ matrix: before_install: - HOMEBREW_NO_AUTO_UPDATE=1 brew install expat gettext - if test "x$BUILD" = xmeson; then - HOMEBREW_NO_AUTO_UPDATE=1 brew install python3 ninja; + HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja; fi - if test "x$BUILD" = xscons; then - HOMEBREW_NO_AUTO_UPDATE=1 brew install python2 scons; + HOMEBREW_NO_AUTO_UPDATE=1 brew install scons; fi # Set PATH for homebrew pip3 installs @@ -53,10 +53,11 @@ install: script: - if test "x$BUILD" = xmeson; then meson _build -Dbuild-tests=true; - ninja -C _build; - ninja -C _build test; + ninja -C _build || travis_terminate 1; + ninja -C _build test || travis_terminate 1; + ninja -C _build install || travis_terminate 1; fi - if test "x$BUILD" = xscons; then - scons; - scons check; + scons || travis_terminate 1; + scons check || travis_terminate 1; fi