projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clover/llvm: Add options for dumping SPIR-V binaries
[mesa.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index bada20dc89cf5b1b3614a486bda4d38a41cebba4..20f216d001c8a6187bd96812f391b74aaa87a8e1 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-129,11
+129,7
@@
test-container:arm64:
variables:
SCONSFLAGS: "-j4"
script:
variables:
SCONSFLAGS: "-j4"
script:
- - if test -n "$LLVM_VERSION"; then
- export LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
- fi
- - scons $SCONS_TARGET
- - eval $SCONS_CHECK_COMMAND
+ - .gitlab-ci/scons-build.sh
meson-main:
extends:
meson-main:
extends:
@@
-335,24
+331,24
@@
meson-i386:
-D llvm=false
-D osmesa=classic
-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"
extends: .scons-build
variables:
SCONS_TARGET: "llvm=1"
SCONS_CHECK_COMMAND: "scons llvm=1 check"
- LLVM_VERSION: "6.0"
+ 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:
scons-old-llvm:
- extends: scons
-llvm
+ extends: scons
image: $STRETCH_IMAGE
image: $STRETCH_IMAGE
- variables:
- LLVM_VERSION: "3.9"
+ 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
.deqp-test:
extends: .ci-run-policy
.deqp-test:
extends: .ci-run-policy