gitlab-ci: reduce the number of scons build

It seems overkill to me to build scons 7x for every pipeline.
Scons is now build with the oldest llvm version in scons-old-llvm
and with the newest llvm version in scons.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80b4b012c464288b884b144cd5b3b71a37869b60..e074f0ac58760e2c54935e3a432d1a4dd9e31a25 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -438,8 +438,6 @@ scons:
     SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check"
   script:
     - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=7 .gitlab-ci/scons-build.sh
     - LLVM_VERSION=8 .gitlab-ci/scons-build.sh
 
 scons-old-llvm:
@@ -448,8 +446,6 @@ scons-old-llvm:
     - .use-x86_build_old
   script:
     - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
 
 .test:
   extends: