diff options
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.ubuntu | 1 | ||||
| -rw-r--r-- | .travis.yml | 17 |
3 files changed, 15 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08f95c86338..db17a6cccc5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,6 +111,14 @@ containers:ubuntu: - make - eval $MAKE_CHECK_COMMAND +.scons-build: + extends: .build + variables: + SCONSFLAGS: "-j4" + script: + - scons $SCONS_TARGET + - eval $SCONS_CHECK_COMMAND + build:meson-vulkan: extends: .meson-build variables: @@ -157,3 +165,9 @@ build:make-vulkan: --disable-gallium-osmesa VULKAN_DRIVERS: intel,radeon LIBUNWIND_FLAGS: --disable-libunwind + +build:scons-nollvm: + extends: .scons-build + variables: + SCONS_TARGET: "llvm=0" + SCONS_CHECK_COMMAND: "scons llvm=0 check" diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index bf4c0bc3668..7f1d23be4a9 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -24,6 +24,7 @@ RUN apt-get install -y \ xz-utils \ libexpat1-dev \ libx11-xcb-dev \ + x11proto-xf86vidmode-dev \ libelf-dev \ python2.7 \ python-pip \ diff --git a/.travis.yml b/.travis.yml index de8395c894b..50bb0333001 100644 --- a/.travis.yml +++ b/.travis.yml @@ -531,23 +531,6 @@ matrix: - python3-pip - python3-setuptools - env: - - LABEL="scons" - - BUILD=scons - - SCONSFLAGS="-j4" - # Explicitly disable. - - SCONS_TARGET="llvm=0" - # Keep it symmetrical to the make build. - - SCONS_CHECK_COMMAND="scons llvm=0 check" - addons: - apt: - packages: - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - LABEL="scons LLVM" - BUILD=scons - SCONSFLAGS="-j4" |