Mesa (master): gitlab-ci: reduce the number of scons build

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6f7ec6ee3979af3de467eedf1f8e52c66de18c9d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f7ec6ee3979af3de467eedf1f8e52c66de18c9d

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Nov 21 08:29:25 2019 +0100

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 at gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80b4b012c46..e074f0ac587 100644
--- 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: