diff options
| author | Eric Engestrom <eric@igalia.com> | 2023-03-17 18:52:24 +0000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-03-22 17:28:07 +0000 |
| commit | 16d5f655021c4238a1b34fe7c15824400912cc47 (patch) | |
| tree | 46f224e9e7576da19d63b3edea84346dd32bbc21 /.gitlab-ci/build | |
| parent | dc53b3917346239f22b35facd2fdea4bb4cbb72f (diff) | |
| download | mesa-16d5f655021c4238a1b34fe7c15824400912cc47.tar.gz | |
ci: always use the -Werror wrapper
Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21997>
Diffstat (limited to '.gitlab-ci/build')
| -rw-r--r-- | .gitlab-ci/build/gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci/build/meson-native-lto-wrappers.txt | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 0642bbfa157..fbf082b2c9b 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -184,7 +184,6 @@ debian-build-testing: GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus" VULKAN_DRIVERS: swrast EXTRA_OPTION: > - --native-file .gitlab-ci/build/meson-native-lto-wrappers.txt -D spirv-to-dxil=true -D osmesa=true -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi @@ -198,7 +197,7 @@ debian-build-testing: section_switch yamllint "yamllint" .gitlab-ci/run-yamllint.sh section_switch meson "meson" - PATH=$PATH:$PWD/.gitlab-ci/build .gitlab-ci/meson/build.sh + .gitlab-ci/meson/build.sh section_switch shader-db "shader-db" .gitlab-ci/run-shader-db.sh @@ -297,7 +296,6 @@ fedora-release: -D glvnd=true -D platforms=x11,wayland EXTRA_OPTION: > - --native-file .gitlab-ci/build/meson-native-lto-wrappers.txt -D b_lto=true -D osmesa=true -D selinux=true @@ -325,7 +323,7 @@ fedora-release: UNWIND: "disabled" VULKAN_DRIVERS: "amd,broadcom,freedreno,imagination-experimental,intel,intel_hasvk" script: - - PATH=$PATH:$PWD/.gitlab-ci/build .gitlab-ci/meson/build.sh + - .gitlab-ci/meson/build.sh debian-android: extends: diff --git a/.gitlab-ci/build/meson-native-lto-wrappers.txt b/.gitlab-ci/build/meson-native-lto-wrappers.txt deleted file mode 100644 index 7bdd2934990..00000000000 --- a/.gitlab-ci/build/meson-native-lto-wrappers.txt +++ /dev/null @@ -1,3 +0,0 @@ -[binaries] -c = 'gcc-link-werror.sh' -cpp = 'g++-link-werror.sh' |