diff options
| -rw-r--r-- | .gitlab-ci.yml | 20 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.ubuntu | 1 | ||||
| -rw-r--r-- | .travis.yml | 24 |
3 files changed, 21 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 600d746ad4c..45c0ee6e4fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,6 +208,26 @@ build:meson-gallium-radeonsi: GALLIUM_DRIVERS: "radeonsi" LLVM_VERSION: "7" +build:meson-gallium-drivers-other: + extends: .meson-build + variables: + UNWIND: "true" + DRI_LOADERS: > + -D glx=disabled + -D egl=false + -D gbm=false + GALLIUM_ST: > + -D dri3=false + -D gallium-vdpau=false + -D gallium-xvmc=false + -D gallium-omx=disabled + -D gallium-va=false + -D gallium-xa=false + -D gallium-nine=false + -D gallium-opencl=disabled + GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" + LLVM_VERSION: "5.0" + build:make-vulkan: extends: .make-build variables: diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index c59a1afadc3..4dae37f9e12 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -25,6 +25,7 @@ RUN apt-get install -y \ libva-dev \ llvm-3.9-dev \ libclang-3.9-dev \ + llvm-5.0-dev \ llvm-6.0-dev \ llvm-7-dev \ xz-utils \ diff --git a/.travis.yml b/.travis.yml index e129c41fc39..f80473ad12a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,30 +55,6 @@ matrix: - python3-pip - python3-setuptools - env: - - LABEL="meson Gallium Drivers Other" - - BUILD=meson - - UNWIND="true" - - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false" - - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled" - - GALLIUM_DRIVERS="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" - - LLVM_VERSION=5.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - addons: - apt: - packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-5.0-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3.5 - - python3-pip - - python3-setuptools - - env: - LABEL="meson Gallium ST Clover LLVM-5.0" - BUILD=meson - UNWIND="true" |