diff options
| author | Eric Engestrom <[email protected]> | 2019-01-28 16:33:22 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-02-06 17:56:30 +0000 |
| commit | 6a19ec9daac669336444f46946ad79ed674ad66f (patch) | |
| tree | 2a1b510f19b7de732e2c93d3fa36470eaf2e29c1 | |
| parent | d4c6d4d5cb577b7daecf38d03cdc0b539a4ba6da (diff) | |
gitlab-ci: add scons SWR build
Signed-off-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.ubuntu | 1 | ||||
| -rw-r--r-- | .travis.yml | 19 |
3 files changed, 8 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9d0a1c2809..3c3f39c530a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,3 +181,10 @@ build:scons-llvm: SCONS_TARGET: "llvm=1" SCONS_CHECK_COMMAND: "scons llvm=1 check" LLVM_VERSION: "3.9" + +build:scons-swr: + extends: .scons-build + variables: + SCONS_TARGET: "swr=1" + SCONS_CHECK_COMMAND: "true" + LLVM_VERSION: "6.0" diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index 8131eeaf0d2..745973a9f73 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -22,6 +22,7 @@ RUN apt-get install -y \ libva-dev \ llvm-3.9-dev \ libclang-3.9-dev \ + llvm-6.0-dev \ llvm-7-dev \ xz-utils \ libexpat1-dev \ diff --git a/.travis.yml b/.travis.yml index 56b920f1315..b27449344ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -531,25 +531,6 @@ matrix: - python3-pip - python3-setuptools - env: - - LABEL="scons SWR" - - BUILD=scons - - SCONSFLAGS="-j4" - - SCONS_TARGET="swr=1" - - LLVM_VERSION=6.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - # Keep it symmetrical to the make build. There's no actual SWR, yet. - - SCONS_CHECK_COMMAND="true" - addons: - apt: - packages: - - llvm-6.0-dev - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - LABEL="macOS make" - BUILD=make - MAKEFLAGS="-j4" |