From: Eric Engestrom Date: Tue, 16 Apr 2019 16:06:30 +0000 (+0200) Subject: gitlab-ci: simplify meson job names X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=043b54a35da8e2a0de1582daaef32aaafee03e72;p=mesa.git gitlab-ci: simplify meson job names Signed-off-by: Eric Engestrom Reviewed-by: Eric Anholt Reviewed-by: Michel Dänzer Acked-by: Dylan Baker --- 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"