aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2017-10-31 17:35:16 +0000
committerEric Engestrom <[email protected]>2017-11-01 09:57:32 +0000
commitf0ab3f76350eadff288153cf8a58536d6bd0761a (patch)
treef111ee5c61a6b954c14404a2b7d4c46b7c9496ab
parentd364684711a5894fd3221191811d56713d6abdee (diff)
travis: build meson first for quicker feedback
Meson is much quicker to build Mesa, giving quicker feedback if executed first. Cc: Dylan Baker <[email protected]> Cc: Emil Velikov <[email protected]> Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--.travis.yml64
1 files changed, 32 insertions, 32 deletions
diff --git a/.travis.yml b/.travis.yml
index 0f42b96cb20..211df3ec1ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,38 @@ env:
matrix:
include:
- env:
+ - LABEL="meson Vulkan"
+ - BUILD=meson
+ - MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers="
+ addons:
+ apt:
+ sources:
+ - llvm-toolchain-trusty-3.9
+ packages:
+ # LLVM packaging is broken and misses these dependencies
+ - libedit-dev
+ # From sources above
+ - llvm-3.9-dev
+ # Common
+ - xz-utils
+ - libexpat1-dev
+ - libelf-dev
+ - python3-pip
+ - env:
+ - LABEL="meson loaders/classic DRI"
+ - BUILD=meson
+ - MESON_OPTIONS="-Dvulkan-drivers= -Dgallium-drivers="
+ addons:
+ apt:
+ packages:
+ - xz-utils
+ - x11proto-xf86vidmode-dev
+ - libexpat1-dev
+ - libx11-xcb-dev
+ - libxdamage-dev
+ - libxfixes-dev
+ - python3-pip
+ - env:
- LABEL="make loaders/classic DRI"
- BUILD=make
- MAKEFLAGS="-j4"
@@ -364,38 +396,6 @@ matrix:
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
- - env:
- - LABEL="meson Vulkan"
- - BUILD=meson
- - MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers="
- addons:
- apt:
- sources:
- - llvm-toolchain-trusty-3.9
- packages:
- # LLVM packaging is broken and misses these dependencies
- - libedit-dev
- # From sources above
- - llvm-3.9-dev
- # Common
- - xz-utils
- - libexpat1-dev
- - libelf-dev
- - python3-pip
- - env:
- - LABEL="meson loaders/classic DRI"
- - BUILD=meson
- - MESON_OPTIONS="-Dvulkan-drivers= -Dgallium-drivers="
- addons:
- apt:
- packages:
- - xz-utils
- - x11proto-xf86vidmode-dev
- - libexpat1-dev
- - libx11-xcb-dev
- - libxdamage-dev
- - libxfixes-dev
- - python3-pip
install:
- pip install --user mako