X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=ab8e67e74bdbbd4ab0c740ec6851a69ea068fb9d;hb=21b90708a4ca0c2ea162dd143ef0c4156e8fb718;hp=23cb24fac161222a3fe5ad6c69a47e9dffec0708;hpb=3ad6154f4eb01bf6b0c9a038be357253958b42ae;p=mesa.git diff --git a/.travis.yml b/.travis.yml index 23cb24fac16..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 @@ -58,6 +59,6 @@ script: 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