GitLab will be down for maintenance this Sunday 13th June, from approx 7-11am UTC. This is for a PostgreSQL migration. See the tracker issue for more informations.

Commit 1bccefb3 authored by Michel Dänzer's avatar Michel Dänzer Committed by Marge Bot
Browse files

ci: Move -Werror enabling from job definitions to meson build script



It was enabled in all jobs.
Reviewed-by: Emma Anholt's avatarEric Anholt <eric@anholt.net>
Part-of: <mesa/mesa!10220>
parent 63e4bdd9
......@@ -646,7 +646,6 @@ meson-testing:
BUILDTYPE: "debugoptimized"
EXTRA_OPTION: >
-D valgrind=false
-D werror=true
MINIO_ARTIFACT_NAME: mesa-amd64
script:
- .gitlab-ci/meson/build.sh
......@@ -661,7 +660,6 @@ meson-testing-asan:
EXTRA_OPTION: >
-D b_sanitize=address
-D valgrind=false
-D werror=true
MINIO_ARTIFACT_NAME: ""
ARTIFACTS_DEBUG_SYMBOLS: 1
......@@ -682,7 +680,6 @@ meson-clover-testing:
BUILDTYPE: "debugoptimized"
EXTRA_OPTION: >
-D valgrind=false
-D werror=true
script:
- .gitlab-ci/meson/build.sh
- .gitlab-ci/prepare-artifacts.sh
......@@ -711,7 +708,6 @@ meson-gallium:
EXTRA_OPTION: >
-D osmesa=true
-D tools=all
-D werror=true
script:
- .gitlab-ci/meson/build.sh
- .gitlab-ci/run-shader-db.sh
......@@ -743,7 +739,6 @@ meson-release:
EXTRA_OPTION: >
-D osmesa=true
-D tools=all
-D werror=true
script:
- .gitlab-ci/meson/build.sh
......@@ -778,7 +773,6 @@ meson-android:
-D llvm=disabled
-D platform-sdk-version=26
-D valgrind=false
-D werror=true
GALLIUM_ST: >
-D dri3=disabled
-D gallium-vdpau=disabled
......@@ -810,8 +804,6 @@ meson-android:
-D egl=enabled
-D platforms=x11
-D osmesa=false
EXTRA_OPTION: >
-D werror=true
GALLIUM_ST: >
-D dri3=enabled
-D gallium-vdpau=disabled
......@@ -843,7 +835,6 @@ meson-armhf:
EXTRA_OPTION: >
-D llvm=disabled
-D valgrind=false
-D werror=true
MINIO_ARTIFACT_NAME: mesa-armhf
script:
- .gitlab-ci/meson/build.sh
......@@ -858,7 +849,6 @@ meson-arm64:
EXTRA_OPTION: >
-D llvm=disabled
-D valgrind=false
-D werror=true
MINIO_ARTIFACT_NAME: mesa-arm64
script:
- .gitlab-ci/meson/build.sh
......@@ -874,7 +864,6 @@ meson-arm64-asan:
-D llvm=disabled
-D b_sanitize=address
-D valgrind=false
-D werror=true
ARTIFACTS_DEBUG_SYMBOLS: 1
MINIO_ARTIFACT_NAME: mesa-arm64-asan
MESON_TEST_ARGS: "--no-suite mesa:compiler"
......@@ -887,7 +876,6 @@ meson-arm64-build-test:
VULKAN_DRIVERS: "amd"
EXTRA_OPTION: >
-Dtools=panfrost
-D werror=true
script:
- .gitlab-ci/meson/build.sh
......@@ -934,8 +922,6 @@ meson-clang:
DRI_LOADERS: >
-D glvnd=true
DRI_DRIVERS: "auto"
EXTRA_OPTION: >
-D werror=true
GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12"
VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental
CC: clang
......@@ -996,7 +982,6 @@ meson-clover:
-D gallium-opencl=icd
EXTRA_OPTION: >
-D valgrind=false
-D werror=true
script:
- LLVM_VERSION=9 .gitlab-ci/meson/build.sh
- .gitlab-ci/meson/build.sh
......@@ -1028,7 +1013,6 @@ meson-vulkan:
EXTRA_OPTION: >
-D vulkan-layers=device-select,overlay
-D build-aco-tests=true
-D werror=true
meson-i386:
extends:
......@@ -1041,7 +1025,6 @@ meson-i386:
DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
EXTRA_OPTION: >
-D vulkan-layers=device-select,overlay
-D werror=true
meson-s390x:
extends:
......@@ -1051,8 +1034,6 @@ meson-s390x:
- kvm
variables:
CROSS: s390x
EXTRA_OPTION: >
-D werror=true
GALLIUM_DRIVERS: "swrast,zink"
# The lp_test_blend test times out with LLVM 11
LLVM_VERSION: 9
......@@ -1064,8 +1045,6 @@ meson-ppc64el:
- .use-ppc64el_build
variables:
CROSS: ppc64el
EXTRA_OPTION: >
-D werror=true
GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
VULKAN_DRIVERS: "amd,swrast"
......@@ -1084,7 +1063,6 @@ meson-mingw32-x86_64:
-Dllvm=disabled
-Dzlib=disabled
-Dosmesa=true
-Dwerror=true
--cross-file=.gitlab-ci/x86_64-w64-mingw32
.test:
......
......@@ -72,6 +72,7 @@ meson _build --native-file=native.file \
${GALLIUM_ST} \
-D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
-D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
-D werror=true \
${EXTRA_OPTION}
cd _build
meson configure
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment