Revert recent changes about not including compute in combined limits.

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 32cd8602e6f06a97f37bfab5bd5d51503212474a..4ef0286a68f3a4c180e26f108cbdabd873d590af 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
-            # llvm-6 depends on gcc-4.9 which is not in main repo
+            # llvm-6 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             # From sources above
@@ -90,6 +90,7 @@ matrix:
             - libx11-xcb-dev
             - libxdamage-dev
             - libxfixes-dev
+            - python3-pip
     - env:
         # NOTE: Building SWR is 2x (yes two) times slower than all the other
         # gallium drivers combined.
@@ -98,10 +99,8 @@ matrix:
         - BUILD=make
         - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=5.0
+        - LLVM_VERSION=6.0
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        - OVERRIDE_CC="gcc-4.8"
-        - OVERRIDE_CXX="g++-4.8"
         - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
         - DRI_DRIVERS=""
         - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
@@ -111,12 +110,12 @@ matrix:
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
+            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
             # From sources above
-            - llvm-5.0-dev
+            - llvm-6.0-dev
             # Common
             - xz-utils
             - x11proto-xf86vidmode-dev
@@ -124,6 +123,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers RadeonSI"
         - BUILD=make
@@ -141,7 +141,7 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
-            # llvm-6 depends on gcc-4.9 which is not in main repo
+            # llvm-6 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             # From sources above
@@ -153,6 +153,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers Other"
         - BUILD=make
@@ -185,6 +186,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-3.9"
@@ -224,6 +226,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-4.0"
@@ -260,6 +263,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-5.0"
@@ -296,6 +300,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-6.0"
@@ -314,7 +319,7 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
-            # llvm-6 depends on gcc-4.9 which is not in main repo
+            # llvm-6 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             - libclc-dev
@@ -329,6 +334,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium ST Other"
         - BUILD=make
@@ -365,6 +371,7 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Vulkan"
         - BUILD=make
@@ -382,7 +389,7 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
-            # llvm-6 depends on gcc-4.9 which is not in main repo
+            # llvm-6 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             # From sources above
@@ -393,6 +400,7 @@ matrix:
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
+            - python3-pip
     - env:
         - LABEL="scons"
         - BUILD=scons
@@ -436,21 +444,19 @@ matrix:
         - BUILD=scons
         - SCONSFLAGS="-j4"
         - SCONS_TARGET="swr=1"
-        - LLVM_VERSION=5.0
+        - LLVM_VERSION=6.0
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         # Keep it symmetrical to the make build. There's no actual SWR, yet.
         - SCONS_CHECK_COMMAND="true"
-        - OVERRIDE_CC="gcc-4.8"
-        - OVERRIDE_CXX="g++-4.8"
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
+            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
             # From sources above
-            - llvm-5.0-dev
+            - llvm-6.0-dev
             # Common
             - xz-utils
             - x11proto-xf86vidmode-dev
@@ -503,7 +509,7 @@ install:
 
   # Install autotools build dependencies
   - if test "x$BUILD" = xmake; then
-      pip2 install --user mako;
+      pip3 install --user mako;
     fi
 
   # Install a more modern scons from pip.