diff options
| -rw-r--r-- | .gitlab-ci.yml | 26 | ||||
| -rw-r--r-- | .travis.yml | 37 |
2 files changed, 26 insertions, 37 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c67c09e19b2..03b77c78e86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -410,6 +410,32 @@ build:make-gallium-st-clover-llvm-7: LLVM_VERSION: "7" GALLIUM_DRIVERS: "r600,radeonsi" +build:make-gallium-st-other: + extends: .make-build + variables: + MAKE_CHECK_COMMAND: "true" + # We should be testing 3.3, but 3.9 is the oldest that still exists in ubuntu + LLVM_VERSION: "3.9" + DRI_LOADERS: > + --disable-glx + --disable-gbm + --disable-egl + GALLIUM_ST: > + --enable-dri + --disable-opencl + --enable-xa + --enable-nine + --enable-xvmc + --enable-vdpau + --enable-va + --enable-omx-bellagio + --enable-gallium-osmesa + # We need swrast for osmesa and nine. + # i915 most likely doesn't work with most ST. + # Regardless - we're doing a quick build test here. + GALLIUM_DRIVERS: "i915,swrast" + LIBUNWIND_FLAGS: --enable-libunwind + build:scons-nollvm: extends: .scons-build variables: diff --git a/.travis.yml b/.travis.yml index 0153a67bd01..7a684e37d00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,43 +32,6 @@ env: matrix: include: - env: - - LABEL="make Gallium ST Other" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=3.5 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - GALLIUM_ST="--enable-dri --disable-opencl --enable-xa --enable-nine --enable-xvmc --enable-vdpau --enable-va --enable-omx-bellagio --enable-gallium-osmesa" - # We need swrast for osmesa and nine. - # i915 most likely doesn't work with most ST. - # Regardless - we're doing a quick build test here. - - GALLIUM_DRIVERS="i915,swrast" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - # We actually want to test against llvm-3.3, yet 3.5 is available - - llvm-3.5-dev - # Nine requires gcc 4.6... which is the one we have right ? - - libxvmc-dev - # Build locally, for now. - #- libvdpau-dev - #- libva-dev - - libomxil-bellagio-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - LABEL="macOS make" - BUILD=make - MAKEFLAGS="-j4" |