X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=ab8e67e74bdbbd4ab0c740ec6851a69ea068fb9d;hb=131c50569066152a8e90b948b0873b990d748e98;hp=cc4d0b260d6fd9735166b23df4a9293562a8d557;hpb=b0853a43da4dd266e49f777e2462eed56301a38f;p=mesa.git diff --git a/.travis.yml b/.travis.yml index cc4d0b260d6..ab8e67e74bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,8 @@ before_install: fi # Set PATH for homebrew pip3 installs - - PATH="$HOME/Library/Python/3.6/bin:${PATH}" + - PYTHON_VERSION=$(python3 -V | awk '{print $2}' | cut -d. -f1-2) + - PATH="$HOME/Library/Python/$PYTHON_VERSION/bin:${PATH}" # Set PKG_CONFIG_PATH for keg-only expat - PKG_CONFIG_PATH="/usr/local/opt/expat/lib/pkgconfig:${PKG_CONFIG_PATH}" # Set PATH for keg-only gettext @@ -55,8 +56,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