diff options
| author | Michel Dänzer <[email protected]> | 2019-09-12 11:45:13 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2019-09-18 10:36:48 +0000 |
| commit | 88e5796daaf6ea9515326ebec45d296fecc5689c (patch) | |
| tree | 6b32afdae72d6b459fef3d48b8e61cbf7d803774 | |
| parent | baa5024e2477068ede9141a16cc22d104c79fd9c (diff) | |
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 <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 588293f276d..20f216d001c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -331,24 +331,19 @@ meson-i386: -D llvm=false -D osmesa=classic -scons-nollvm: - extends: .scons-build - variables: - SCONS_TARGET: "llvm=0" - SCONS_CHECK_COMMAND: "scons llvm=0 check" - -scons-llvm: +scons: extends: .scons-build variables: SCONS_TARGET: "llvm=1" SCONS_CHECK_COMMAND: "scons llvm=1 check" script: + - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .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: - extends: scons-llvm + extends: scons image: $STRETCH_IMAGE script: - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh |