OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: always use the -Werror wrapper

Browse Source 
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>
This commit is contained in:
Eric Engestrom
2023-03-17 18:52:24 +00:00
committed by Marge Bot
parent dc53b39173
commit 16d5f65502
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci/build/gitlab-ci.yml
View File

@@ -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" GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
VULKAN_DRIVERS: swrast VULKAN_DRIVERS: swrast
EXTRA_OPTION: > EXTRA_OPTION: >
--native-file .gitlab-ci/build/meson-native-lto-wrappers.txt
-D spirv-to-dxil=true -D spirv-to-dxil=true
-D osmesa=true -D osmesa=true
-D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi -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" section_switch yamllint "yamllint"
.gitlab-ci/run-yamllint.sh .gitlab-ci/run-yamllint.sh
section_switch meson "meson" 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" section_switch shader-db "shader-db"
.gitlab-ci/run-shader-db.sh .gitlab-ci/run-shader-db.sh
@@ -297,7 +296,6 @@ fedora-release:
-D glvnd=true -D glvnd=true
-D platforms=x11,wayland -D platforms=x11,wayland
EXTRA_OPTION: > EXTRA_OPTION: >
--native-file .gitlab-ci/build/meson-native-lto-wrappers.txt
-D b_lto=true -D b_lto=true
-D osmesa=true -D osmesa=true
-D selinux=true -D selinux=true
@@ -325,7 +323,7 @@ fedora-release:
UNWIND: "disabled" UNWIND: "disabled"
VULKAN_DRIVERS: "amd,broadcom,freedreno,imagination-experimental,intel,intel_hasvk" VULKAN_DRIVERS: "amd,broadcom,freedreno,imagination-experimental,intel,intel_hasvk"
script: script:
- PATH=$PATH:$PWD/.gitlab-ci/build .gitlab-ci/meson/build.sh - .gitlab-ci/meson/build.sh
debian-android: debian-android:
extends: extends:

3
.gitlab-ci/build/meson-native-lto-wrappers.txt
View File

@@ -1,3 +0,0 @@
[binaries]
c = 'gcc-link-werror.sh'
cpp = 'g++-link-werror.sh'

13
.gitlab-ci/meson/build.sh
View File

@@ -7,18 +7,23 @@ set -o xtrace
CROSS_FILE=/cross_file-"$CROSS".txt CROSS_FILE=/cross_file-"$CROSS".txt
export PATH=$PATH:$PWD/.gitlab-ci/build
touch native.file
printf > native.file "%s\n" \
"[binaries]" \
"c = '${CC:-gcc}-link-werror.sh'" \
"cpp = '${CXX:-g++}-link-werror.sh'"
# We need to control the version of llvm-config we're using, so we'll # We need to control the version of llvm-config we're using, so we'll
# tweak the cross file or generate a native file to do so. # tweak the cross file or generate a native file to do so.
if test -n "$LLVM_VERSION"; then if test -n "$LLVM_VERSION"; then
LLVM_CONFIG="llvm-config-${LLVM_VERSION}" LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file echo "llvm-config = '`which $LLVM_CONFIG`'" >> native.file
if [ -n "$CROSS" ]; then if [ -n "$CROSS" ]; then
sed -i -e '/\[binaries\]/a\' -e "llvm-config = '`which $LLVM_CONFIG`'" $CROSS_FILE sed -i -e '/\[binaries\]/a\' -e "llvm-config = '`which $LLVM_CONFIG`'" $CROSS_FILE
fi fi
$LLVM_CONFIG --version $LLVM_CONFIG --version
else
rm -f native.file
touch native.file
fi fi
# cross-xfail-$CROSS, if it exists, contains a list of tests that are expected # cross-xfail-$CROSS, if it exists, contains a list of tests that are expected