Commit c3727ae4 authored by Michel Dänzer's avatar Michel Dänzer Committed by Michel Dänzer
Browse files

gitlab-ci: Fold scons-swr job into scons job



Should be fast enough.
Acked-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Part-of: <mesa/mesa!4166>
parent 3ff437ab
......@@ -382,13 +382,6 @@ meson-clang:
script:
- cmd /C .gitlab-ci\meson-build.bat
scons-swr:
extends: .scons-build
variables:
SCONS_TARGET: "swr=1"
SCONS_CHECK_COMMAND: "true"
LLVM_VERSION: "6.0"
scons-win64:
extends: .scons-build
variables:
......@@ -519,8 +512,8 @@ meson-mingw32-x86_64:
scons:
extends: .scons-build
variables:
SCONS_TARGET: "llvm=1"
SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check"
SCONS_TARGET: "llvm=1 swr=1"
SCONS_CHECK_COMMAND: "scons force_scons=1 ${SCONS_TARGET} check"
script:
- SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh
- LLVM_VERSION=9 .gitlab-ci/scons-build.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment