diff options
| author | Eric Engestrom <[email protected]> | 2019-01-28 20:36:25 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-02-06 17:56:30 +0000 |
| commit | cc85f5002914e59a3e9a912b9dccdf2d1c0aff2e (patch) | |
| tree | 86394007fd29e4fea4901adcf60abf412dff41ff | |
| parent | 984e295500580fc706330bf46fe28b71e89f5d57 (diff) | |
gitlab-ci: add make Gallium ST Clover LLVM-4.0 build
Signed-off-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.ubuntu | 2 | ||||
| -rw-r--r-- | .travis.yml | 30 |
3 files changed, 7 insertions, 30 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 360eec62ade..f8db1b75a56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -389,6 +389,11 @@ build:make-gallium-st-clover-llvm-39: GALLIUM_DRIVERS: "r600" LIBUNWIND_FLAGS: --enable-libunwind +build:make-gallium-st-clover-llvm-4: + extends: build:make-gallium-st-clover-llvm-39 + variables: + LLVM_VERSION: "4.0" + build:scons-nollvm: extends: .scons-build variables: diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index 72f1efe0274..ef7fba78773 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -25,6 +25,8 @@ RUN apt-get install -y \ libva-dev \ llvm-3.9-dev \ libclang-3.9-dev \ + llvm-4.0-dev \ + libclang-4.0-dev \ llvm-5.0-dev \ llvm-6.0-dev \ llvm-7-dev \ diff --git a/.travis.yml b/.travis.yml index 4d6579db550..aea323bd183 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,36 +32,6 @@ env: matrix: include: - env: - - LABEL="make Gallium ST Clover LLVM-4.0" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=4.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 packaging is broken and misses these dependencies - - libedit-dev - - llvm-4.0-dev - - clang-4.0 - - libclang-4.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-5.0" - BUILD=make - MAKEFLAGS="-j4" |