diff options
| -rw-r--r-- | .gitlab-ci.yml | 49 | ||||
| -rw-r--r-- | .travis.yml | 28 |
2 files changed, 49 insertions, 28 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bec220666d..08f95c86338 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,30 @@ containers:ubuntu: - ninja - ninja test +.make-build: + extends: .build + variables: + MAKEFLAGS: "-j4" + before_script: + - if test -n "$LLVM_VERSION"; then + export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; + fi + - mkdir build + - cd build + - ../autogen.sh + --enable-autotools + --enable-debug + $LIBUNWIND_FLAGS + $DRI_LOADERS + --with-dri-drivers=$DRI_DRIVERS + $GALLIUM_ST + --with-gallium-drivers=$GALLIUM_DRIVERS + --with-vulkan-drivers=$VULKAN_DRIVERS + --disable-llvm-shared-libs + script: + - make + - eval $MAKE_CHECK_COMMAND + build:meson-vulkan: extends: .meson-build variables: @@ -108,3 +132,28 @@ build:meson-vulkan: -D gallium-opencl=disabled VULKAN_DRIVERS: intel,amd LLVM_VERSION: "7" + +build:make-vulkan: + extends: .make-build + variables: + MAKE_CHECK_COMMAND: "make -C src/gtest check && make -C src/intel check" + LLVM_VERSION: "7" + DRI_LOADERS: > + --disable-glx + --disable-gbm + --disable-egl + --with-platforms=x11,wayland,drm + DRI_DRIVERS: "" + GALLIUM_ST: > + --enable-dri + --enable-dri3 + --disable-opencl + --disable-xa + --disable-nine + --disable-xvmc + --disable-vdpau + --disable-va + --disable-omx-bellagio + --disable-gallium-osmesa + VULKAN_DRIVERS: intel,radeon + LIBUNWIND_FLAGS: --disable-libunwind diff --git a/.travis.yml b/.travis.yml index 141337db26d..de8395c894b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -531,34 +531,6 @@ matrix: - python3-pip - python3-setuptools - env: - - LABEL="make Vulkan" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - - LLVM_VERSION=7 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - - DRI_DRIVERS="" - - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="intel,radeon" - - LIBUNWIND_FLAGS="--disable-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: - # From sources above - - llvm-7-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - python3-pip - - python3-setuptools - - env: - LABEL="scons" - BUILD=scons - SCONSFLAGS="-j4" |