projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
etnaviv: use surface format directly
[mesa.git] / .travis.yml
diff --git a/.travis.yml b/.travis.yml
index 90f9ec40e12cefea994f2ddaeb3a0ce721921f82..8eceb4e86f56ce10beb1fd1272d85fd35baf1284 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,21 +38,24 @@ matrix:
         - DRI_DRIVERS=""
         - GALLIUM_DRIVERS=""
         - VULKAN_DRIVERS="intel,amd"
-        - LLVM_VERSION=6.0
+        - LLVM_VERSION=7
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-6.0
-            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main'
+              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            # llvm-7 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             # From sources above
-            - llvm-6.0-dev
+            - llvm-7-dev
             # Common
             - xz-utils
             - libexpat1-dev
+            - libx11-xcb-dev
             - libelf-dev
+            - python3.5
             - python3-pip
     - env:
         - LABEL="meson loaders/classic DRI"
@@ -69,6 +72,7 @@ matrix:
             - libx11-xcb-dev
             - libxdamage-dev
             - libxfixes-dev
+            - python3.5
             - python3-pip
     - env:
         - LABEL="make loaders/classic DRI"
@@ -90,6 +94,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.
@@ -117,17 +122,17 @@ matrix:
             - llvm-6.0-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers RadeonSI"
         - BUILD=make
         - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=6.0
+        - LLVM_VERSION=7
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
         - DRI_DRIVERS=""
@@ -138,19 +143,20 @@ matrix:
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-6.0
-            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main'
+              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            # llvm-7 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             # From sources above
-            - llvm-6.0-dev
+            - llvm-7-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Gallium Drivers Other"
         - BUILD=make
@@ -178,13 +184,12 @@ matrix:
             - llvm-3.9-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - 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"
         - BUILD=make
         - MAKEFLAGS="-j4"
@@ -217,13 +222,12 @@ matrix:
             - libclang-3.9-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - 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"
         - BUILD=make
         - MAKEFLAGS="-j4"
@@ -253,13 +257,12 @@ matrix:
             - libclang-4.0-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - 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"
         - BUILD=make
         - MAKEFLAGS="-j4"
@@ -289,13 +292,12 @@ matrix:
             - libclang-5.0-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - 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"
         - BUILD=make
         - MAKEFLAGS="-j4"
@@ -305,7 +307,7 @@ matrix:
         - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
         - DRI_DRIVERS=""
         - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
-        - GALLIUM_DRIVERS="r600,radeonsi"
+        - GALLIUM_DRIVERS="r600"
         - VULKAN_DRIVERS=""
         - LIBUNWIND_FLAGS="--enable-libunwind"
       addons:
@@ -322,7 +324,39 @@ matrix:
             - libclang-6.0-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+            - libunwind8-dev
+            - python3-pip
+    - env:
+        - LABEL="make Gallium ST Clover LLVM-7"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="true"
+        - LLVM_VERSION=7
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
+        - DRI_DRIVERS=""
+        - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
+        - GALLIUM_DRIVERS="r600,radeonsi"
+        - VULKAN_DRIVERS=""
+        - LIBUNWIND_FLAGS="--enable-libunwind"
+      addons:
+        apt:
+          sources:
+            - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main'
+              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            # llvm-7 requires libstdc++4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
+          packages:
+            - libclc-dev
+            # From sources above
+            - llvm-7-dev
+            - clang-7
+            - libclang-7-dev
+            # Common
+            - xz-utils
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
@@ -358,17 +392,17 @@ matrix:
             - libedit-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
+            - python3-pip
     - env:
         - LABEL="make Vulkan"
         - BUILD=make
         - MAKEFLAGS="-j4"
         - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
-        - LLVM_VERSION=6.0
+        - LLVM_VERSION=7
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
         - DRI_DRIVERS=""
@@ -379,18 +413,19 @@ matrix:
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-6.0
-            # llvm-6 requires libstdc++4.9 which is not in main repo
+            - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main'
+              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            # llvm-7 requires libstdc++4.9 which is not in main repo
             - ubuntu-toolchain-r-test
           packages:
             # From sources above
-            - llvm-6.0-dev
+            - llvm-7-dev
             # Common
             - xz-utils
-            - x11proto-xf86vidmode-dev
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
+            - python3-pip
     - env:
         - LABEL="scons"
         - BUILD=scons
@@ -490,10 +525,11 @@ before_install:
 
 install:
   # Install a more modern meson from pip, since the version in the
-  # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python
-  # 3.5+
+  # ubuntu repos is often quite old. This requires python>=3.5, so
+  # let's make it default
   - if test "x$BUILD" = xmeson; then
-      pip3 install --user "meson<0.45.0";
+      sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 10;
+      pip3 install --user meson;
       pip3 install --user mako;
     fi