mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 10:36:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Adjust meson cross file to block use of sdl2-config

Browse source 
Turn back off allow failures for the 32 bit meson build.
This commit is contained in:
Ryan Pavlik 2020-05-07 15:15:36 -05:00
parent 4ab0160fb7
commit 00868d56f0
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -224,8 +224,6 @@ debian:meson:32bit:
- .monado.debian:buster # local
- .fdo.distribution-image@debian # from ci-templates
- .monado.build-meson # local
# Known bug - it still tries to use SDL2.
allow_failure: true
variables:
MESON_ARGS: --prefix /usr --libdir /usr/lib/i386-linux-gnu --cross-file ../.gitlab-ci/i386-cross.txt

1
.gitlab-ci/i386-cross.txt
View file

@ -6,6 +6,7 @@ strip = '/usr/bin/i686-linux-gnu-strip'
objcopy = '/usr/bin/i686-linux-gnu-objcopy'
ld= '/usr/bin/i686-linux-gnu-ld'
pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'
sdl2-config = '/bin/false'
[properties]
needs_exe_wrapper = False