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

Should be fast enough.

Acked-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4166>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07a9a5cbe75690b841403b21fd232bea9ec6eda0..76f826e47cfbfc5dc9bd3437a5568ea10a1d9c1b 100644 (file)
--- 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