gitlab-ci: Merge scons-nollvm and scons-llvm jobs
The new job tests scons without LLVM and with all LLVM versions >= 6.0. Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
parent
baa5024e24
commit
88e5796daa
|
@ -331,24 +331,19 @@ meson-i386:
|
||||||
-D llvm=false
|
-D llvm=false
|
||||||
-D osmesa=classic
|
-D osmesa=classic
|
||||||
|
|
||||||
scons-nollvm:
|
scons:
|
||||||
extends: .scons-build
|
|
||||||
variables:
|
|
||||||
SCONS_TARGET: "llvm=0"
|
|
||||||
SCONS_CHECK_COMMAND: "scons llvm=0 check"
|
|
||||||
|
|
||||||
scons-llvm:
|
|
||||||
extends: .scons-build
|
extends: .scons-build
|
||||||
variables:
|
variables:
|
||||||
SCONS_TARGET: "llvm=1"
|
SCONS_TARGET: "llvm=1"
|
||||||
SCONS_CHECK_COMMAND: "scons llvm=1 check"
|
SCONS_CHECK_COMMAND: "scons llvm=1 check"
|
||||||
script:
|
script:
|
||||||
|
- SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .gitlab-ci/scons-build.sh
|
||||||
- LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh
|
- LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh
|
||||||
- LLVM_VERSION=7 .gitlab-ci/scons-build.sh
|
- LLVM_VERSION=7 .gitlab-ci/scons-build.sh
|
||||||
- LLVM_VERSION=8 .gitlab-ci/scons-build.sh
|
- LLVM_VERSION=8 .gitlab-ci/scons-build.sh
|
||||||
|
|
||||||
scons-old-llvm:
|
scons-old-llvm:
|
||||||
extends: scons-llvm
|
extends: scons
|
||||||
image: $STRETCH_IMAGE
|
image: $STRETCH_IMAGE
|
||||||
script:
|
script:
|
||||||
- LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
|
- LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
|
||||||
|
|
Loading…
Reference in New Issue