diff options
| -rw-r--r-- | .gitlab-ci.yml | 23 | ||||
| -rw-r--r-- | .travis.yml | 23 |
2 files changed, 23 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fafc9e075e7..e9af186083e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -305,6 +305,29 @@ build:make-vulkan: VULKAN_DRIVERS: intel,radeon LIBUNWIND_FLAGS: --disable-libunwind +build:make-loader-classic-dri: + extends: .make-build + variables: + MAKE_CHECK_COMMAND: "make check" + DRI_LOADERS: > + --enable-glx + --enable-gbm + --enable-egl + --with-platforms=x11,wayland,drm,surfaceless + --enable-osmesa + DRI_DRIVERS: "i915,i965,radeon,r200,swrast,nouveau" + GALLIUM_ST: > + --enable-dri + --disable-opencl + --disable-xa + --disable-nine + --disable-xvmc + --disable-vdpau + --disable-va + --disable-omx-bellagio + --disable-gallium-osmesa + LIBUNWIND_FLAGS: --disable-libunwind + build:scons-nollvm: extends: .scons-build variables: diff --git a/.travis.yml b/.travis.yml index 041ebea1e05..08c99c892a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,29 +32,6 @@ env: matrix: include: - env: - - LABEL="make loaders/classic DRI" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="make check" - - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless,wayland --enable-osmesa" - - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau" - - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--disable-libunwind" - addons: - apt: - packages: - - xz-utils - - x11proto-xf86vidmode-dev - - libxxf86vm-dev - - libexpat1-dev - - libx11-xcb-dev - - libxdamage-dev - - libxfixes-dev - - python3-pip - - python3-setuptools - - env: # NOTE: Building SWR is 2x (yes two) times slower than all the other # gallium drivers combined. # Start this early so that it doesn't hunder the run time. |