diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-06-24 16:48:46 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | da94d0c0290fab5635713a8f587ad091e9b8ab2f (patch) | |
| tree | 75eeb6eec57cee8d0d8ed9e444b1a0407736d7f9 /tools | |
| parent | 5eee2d552a27688a1ff33e3a587f45e6406c85cf (diff) | |
| download | dbus-da94d0c0290fab5635713a8f587ad091e9b8ab2f.tar.gz | |
CI: Only use openSUSE mingw*-meson as a replacement for `meson setup`
These pass a lot of configure arguments taken from RPM macros, which
are only accepted by the meson command if we don't explicitly select
a mode.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 694fc128..8a0ddcc0 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -438,20 +438,28 @@ case "$ci_buildsys" in # travis-ci, and too slow when running under wine. export DBUS_TEST_MALLOC_FAILURES=0 - meson=meson + meson_setup= + + # openSUSE has convenience wrappers that run Meson with appropriate + # cross options case "$ci_host" in (i686-w64-mingw32) - meson=mingw32-meson + meson_setup=mingw32-meson ;; (x86_64-w64-mingw32) - meson=mingw64-meson + meson_setup=mingw64-meson ;; esac + + if [ -z "$meson_setup" ]; then + meson_setup="meson setup" + fi + # FIXME: ducktype target fails on debian CI.. - $meson setup -Dducktype_docs=disabled - $meson compile - [ "$ci_test" = no ] || $meson test - DESTDIR=DESTDIR $meson install + $meson_setup -Dducktype_docs=disabled + meson compile + [ "$ci_test" = no ] || meson test + DESTDIR=DESTDIR meson install ( cd DESTDIR && find . -ls) ;; esac |