From 360a7bfbe9145589f305f692cdf8dfd73515295a Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 28 Jan 2019 20:40:25 +0000 Subject: [PATCH] gitlab-ci: add make Gallium ST Clover LLVM-7 build Signed-off-by: Eric Engestrom --- .gitlab-ci.yml | 6 ++++++ .travis.yml | 30 ------------------------------ 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32cce6b7fb5..c67c09e19b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -404,6 +404,12 @@ build:make-gallium-st-clover-llvm-6: variables: LLVM_VERSION: "6.0" +build:make-gallium-st-clover-llvm-7: + extends: build:make-gallium-st-clover-llvm-39 + variables: + LLVM_VERSION: "7" + GALLIUM_DRIVERS: "r600,radeonsi" + build:scons-nollvm: extends: .scons-build variables: diff --git a/.travis.yml b/.travis.yml index d6e9b4cf92d..0153a67bd01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,36 +31,6 @@ env: matrix: include: - - env: - - LABEL="make Gallium ST Clover LLVM-7" - - 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="--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,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: - - libclc-dev - # From sources above - - llvm-7-dev - - clang-7 - - libclang-7-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - env: - LABEL="make Gallium ST Other" - BUILD=make -- 2.30.2