diff options
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .travis.yml | 28 |
2 files changed, 5 insertions, 28 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c624bbd0a15..32cce6b7fb5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -399,6 +399,11 @@ build:make-gallium-st-clover-llvm-5: variables: LLVM_VERSION: "5.0" +build:make-gallium-st-clover-llvm-6: + extends: build:make-gallium-st-clover-llvm-39 + variables: + LLVM_VERSION: "6.0" + build:scons-nollvm: extends: .scons-build variables: diff --git a/.travis.yml b/.travis.yml index d23ba37f519..d6e9b4cf92d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,34 +32,6 @@ env: matrix: include: - env: - - LABEL="make Gallium ST Clover LLVM-6.0" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=6.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="r600" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - - libclc-dev - - llvm-6.0-dev - - clang-6.0 - - libclang-6.0-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - LABEL="make Gallium ST Clover LLVM-7" - BUILD=make - MAKEFLAGS="-j4" |