diff options
| author | Eric Engestrom <[email protected]> | 2019-01-28 20:24:04 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-02-06 17:56:30 +0000 |
| commit | d0dff24cbb82ffe366e95963a8511b7600c3030e (patch) | |
| tree | d53f45a21a78b0ed1324ae0d3258c602a0abf403 | |
| parent | 055cfbc6deb585c7cfb4979e3869e354cb0e6b49 (diff) | |
gitlab-ci: add make Gallium Drivers "Other" build
Signed-off-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .travis.yml | 27 |
2 files changed, 6 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90ff7f8b540..511ed47caf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -359,6 +359,12 @@ build:make-gallium-drivers-radeonsi: LLVM_VERSION: "7" GALLIUM_DRIVERS: "radeonsi" +build:make-gallium-drivers-other: + extends: build:make-gallium-drivers-swr + variables: + LLVM_VERSION: "3.9" + GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" + build:scons-nollvm: extends: .scons-build variables: diff --git a/.travis.yml b/.travis.yml index 228eb37fb9a..fe82a0931b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,33 +32,6 @@ env: matrix: include: - env: - - LABEL="make Gallium Drivers Other" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=3.9 - - 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="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-3.9-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - LABEL="make Gallium ST Clover LLVM-3.9" - BUILD=make - MAKEFLAGS="-j4" |