frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: switch the mingw cross-compile job to use the meson build script too 

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1317>
This commit is contained in:
Peter Hutterer 2024-02-20 09:48:12 +10:00 committed by Marge Bot
parent ce2f24c510
commit cd6840f18e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -101,8 +101,9 @@ meson-nolibdecor:
mingw-cross-build: mingw-cross-build:
extends: .common-build-and-test extends: .common-build-and-test
script: script:
- meson --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dsecure-rpc=false -Dlisten_tcp=true $MESON_BUILDDIR/ - .gitlab-ci/meson-build.sh --run-install
- ninja -j${FDO_CI_CONCURRENT:-4} -C $MESON_BUILDDIR/ install variables:
MESON_ARGS: --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dsecure-rpc=false -Dlisten_tcp=true
meson-dist: meson-dist:
extends: .common-build-and-test extends: .common-build-and-test