summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-04-16 18:06:30 +0200
committerEric Anholt <eric@anholt.net>2019-05-02 20:39:12 +0000
commit043b54a35da8e2a0de1582daaef32aaafee03e72 (patch)
tree763ccd4dc4b0bf14b1fe05598e42f70b6b8fa538 /.gitlab-ci.yml
parent43f15464203adb62ee62746c5684df0cbd162762 (diff)
gitlab-ci: simplify meson job names
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Acked-by: Dylan Baker <dylan@pnwbakers.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfd7530f5d8..bdce87eb54e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,7 +126,7 @@ debian:
# We also put softpipe (and therefore gallium nine, which requires
# it) here, since softpipe/llvmpipe can't be built alongside classic
# swrast.
-meson-gallium-swr:
+meson-swr:
extends: .meson-build
variables:
UNWIND: "true"
@@ -227,7 +227,7 @@ meson-glvnd:
-D gallium-nine=false
-D gallium-opencl=disabled
-meson-gallium-clover-llvm:
+meson-clover-llvm:
extends: .meson-build
variables:
UNWIND: "true"
@@ -246,8 +246,8 @@ meson-gallium-clover-llvm:
-D gallium-opencl=icd
GALLIUM_DRIVERS: "r600,radeonsi"
-meson-gallium-clover-llvm39:
- extends: meson-gallium-clover-llvm
+meson-clover-llvm39:
+ extends: meson-clover-llvm
variables:
GALLIUM_DRIVERS: "i915,r600"
LLVM_VERSION: "3.9"