fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gitlab-ci: simplify $CROSS option

Browse source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Eric Engestrom 2019-08-09 23:46:50 +01:00
parent f1dba99639
commit 1c82fa0a92
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -257,7 +257,7 @@ meson-vulkan:
meson-armhf:
extends: .meson-cross
variables:
CROSS: --cross /cross_file-armhf.txt
CROSS: armhf
VULKAN_DRIVERS: freedreno
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
# Disable the tests since we're cross compiling.
@ -269,7 +269,7 @@ meson-armhf:
meson-arm64:
extends: .meson-cross
variables:
CROSS: --cross /cross_file-arm64.txt
CROSS: arm64
VULKAN_DRIVERS: freedreno
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
# Disable the tests since we're cross compiling.
@ -281,7 +281,7 @@ meson-arm64:
meson-i386:
extends: .meson-cross
variables:
CROSS: --cross /cross_file-i386.txt
CROSS: i386
VULKAN_DRIVERS: intel
GALLIUM_DRIVERS: "swrast"
# Disable i386 tests, because u_format_tests gets precision

2
.gitlab-ci/meson-build.sh
View file

@ -16,7 +16,7 @@ fi
rm -rf _build
meson _build --native-file=native.file \
${CROSS} \
${CROSS+--cross /cross_file-$CROSS.txt} \
-D libdir=lib \
-D buildtype=debug \
-D build-tests=true \