summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-10-21 09:29:23 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-10-24 18:33:50 +0000
commit54053bc8d0dad89a38e2179050831f64a02ea4ec (patch)
tree1bc1f097993619b6d8f6073f680c088369a9b046 /.gitlab-ci.yml
parent79e73887e7c9a0c2759e7e66a0e1a90c884ceacb (diff)
downloadmesa-54053bc8d0dad89a38e2179050831f64a02ea4ec.tar.gz
scons: Print a deprecation warning about using scons on not windows
At this point meson should be able to handle all of the non-windows platforms just fine; we'd like to be able to stop maintaining scons for those platforms sooner than later. Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8c16dc0f51..a08a33f60f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -377,9 +377,9 @@ scons:
extends: .scons-build
variables:
SCONS_TARGET: "llvm=1"
- SCONS_CHECK_COMMAND: "scons llvm=1 check"
+ SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check"
script:
- - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .gitlab-ci/scons-build.sh
+ - 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