summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-01-28 20:21:44 +0000
committerEric Engestrom <[email protected]>2019-02-06 17:56:30 +0000
commit055cfbc6deb585c7cfb4979e3869e354cb0e6b49 (patch)
tree905f9cc5d18b3ee95f3d6b2957396ae0c1210eef
parent7b26a19f31158d8deafb8b9abf572f36342b7372 (diff)
gitlab-ci: add make Gallium Drivers RadeonSI build
Signed-off-by: Eric Engestrom <[email protected]>
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--.travis.yml29
2 files changed, 6 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f414187848a..90ff7f8b540 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -353,6 +353,12 @@ build:make-gallium-drivers-swr:
GALLIUM_DRIVERS: "swr"
LIBUNWIND_FLAGS: --enable-libunwind
+build:make-gallium-drivers-radeonsi:
+ extends: build:make-gallium-drivers-swr
+ variables:
+ LLVM_VERSION: "7"
+ GALLIUM_DRIVERS: "radeonsi"
+
build:scons-nollvm:
extends: .scons-build
variables:
diff --git a/.travis.yml b/.travis.yml
index 27e681cf5d3..228eb37fb9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,35 +32,6 @@ env:
matrix:
include:
- env:
- - LABEL="make Gallium Drivers RadeonSI"
- - 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="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
- - GALLIUM_DRIVERS="radeonsi"
- - VULKAN_DRIVERS=""
- - LIBUNWIND_FLAGS="--enable-libunwind"
- addons:
- apt:
- sources:
- - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
- key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
- packages:
- # From sources above
- - llvm-7-dev
- # Common
- - xz-utils
- - libexpat1-dev
- - libx11-xcb-dev
- - libelf-dev
- - libunwind8-dev
- - python3-pip
- - python3-setuptools
- - env:
- LABEL="make Gallium Drivers Other"
- BUILD=make
- MAKEFLAGS="-j4"