From cd6840f18e6ea4c775149e2f1ae4c498bdb68b82 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 20 Feb 2024 09:48:12 +1000 Subject: [PATCH] CI: switch the mingw cross-compile job to use the meson build script too Part-of: --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c0af2546..8fa00ba91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,8 +101,9 @@ meson-nolibdecor: mingw-cross-build: extends: .common-build-and-test script: - - meson --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dsecure-rpc=false -Dlisten_tcp=true $MESON_BUILDDIR/ - - ninja -j${FDO_CI_CONCURRENT:-4} -C $MESON_BUILDDIR/ install + - .gitlab-ci/meson-build.sh --run-install + variables: + MESON_ARGS: --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dsecure-rpc=false -Dlisten_tcp=true meson-dist: extends: .common-build-and-test