nir: Allow var_mem_global in nir_lower_vars_to_explicit_types

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 6214132289c4fd52d3e53953015f9a1d632d6c9d..ab8e67e74bdbbd4ab0c740ec6851a69ea068fb9d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,25 @@ env:
   global:
     - PKG_CONFIG_PATH=""
 
+matrix:
+  include:
+    - env:
+      - BUILD=meson
+    - env:
+      - BUILD=scons
+
 before_install:
-  - HOMEBREW_NO_AUTO_UPDATE=1 brew install python3 ninja expat gettext
+  - HOMEBREW_NO_AUTO_UPDATE=1 brew install expat gettext
+  - if test "x$BUILD" = xmeson; then
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja;
+    fi
+  - if test "x$BUILD" = xscons; then
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install scons;
+    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
@@ -28,13 +43,22 @@ before_install:
   - PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
 install:
-  - pip3 install --user meson
-  - pip3 install --user mako
+  - if test "x$BUILD" = xmeson; then
+      pip3 install --user meson;
+      pip3 install --user mako;
+    fi
+  - if test "x$BUILD" = xscons; then
+      pip2 install --user mako;
+    fi
 
 script:
-  - meson _build
-      -Dbuild-tests=true
-      -Dplatforms=x11
-      -Dgallium-drivers=swrast
-  - ninja -C _build
-  - ninja -C _build test
+  - if test "x$BUILD" = xmeson; then
+      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 force_scons=1 || travis_terminate 1;
+      scons force_scons=1 check || travis_terminate 1;
+    fi