From: Samuel Pitoiset Date: Thu, 21 Nov 2019 07:29:25 +0000 (+0100) Subject: gitlab-ci: reduce the number of scons build X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f7ec6ee3979af3de467eedf1f8e52c66de18c9d;p=mesa.git 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 Reviewed-by: Michel Dänzer Reviewed-by: Eric Anholt --- 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: