X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=6528b104667353acf3f90aa7f3963e6f3cbaae16;hb=8772d95d40367a2e27aef2127213a99540625632;hp=97720cf118ac24fa819504878f71952f63e7fd9f;hpb=029b07b2adbde4466e4776e10cf37ec30aee4f1f;p=mesa.git diff --git a/.travis.yml b/.travis.yml index 97720cf118a..6528b104667 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 @@ -55,8 +55,9 @@ script: meson _build -Dbuild-tests=true; 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 || travis_terminate 1; - scons check || travis_terminate 1; + scons force_scons=1 || travis_terminate 1; + scons force_scons=1 check || travis_terminate 1; fi