diff options
| author | Michel Dänzer <[email protected]> | 2020-03-12 12:13:44 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2020-03-17 11:17:10 +0100 |
| commit | c3727ae431a132c1334884675f9c6c64ea6472b2 (patch) | |
| tree | fa3f9cc317e09a56d037ff5f72e1b0b14209752a | |
| parent | 3ff437abb3f4ecaef1e3f241392b827cc3fdd202 (diff) | |
gitlab-ci: Fold scons-swr job into scons job
Should be fast enough.
Acked-by: Eric Engestrom <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4166>
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07a9a5cbe75..76f826e47cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 |