diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-02-06 02:44:59 +0400 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | 07ddd3597e0ee4dfad35629eaaa80f6936fc8609 (patch) | |
| tree | 17b86f783c52f78e8783efb63fa60271ab5aba49 /tools | |
| parent | 60a88f360ca42abd76d791c7e246197bda731e5f (diff) | |
| download | dbus-07ddd3597e0ee4dfad35629eaaa80f6936fc8609.tar.gz | |
Add meson build CI
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 19 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 5 | ||||
| -rw-r--r-- | tools/docker/windows/Dockerfile | 2 |
3 files changed, 24 insertions, 2 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 3772daad..7b8f1e71 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -427,6 +427,25 @@ case "$ci_buildsys" in ${make} install DESTDIR=$(pwd)/DESTDIR ( cd DESTDIR && find . -ls) ;; + + (meson) + # The test coverage for OOM-safety is too verbose to be useful on + # travis-ci, and too slow when running under wine. + export DBUS_TEST_MALLOC_FAILURES=0 + + meson=meson + case "$ci_host" in + (*-w64-mingw32) + meson=mingw64-meson + ;; + esac + # FIXME: ducktype target fails on debian CI.. + $meson setup -Dducktype_docs=disabled + $meson compile + [ "$ci_test" = no ] || $meson test + DESTDIR=DESTDIR $meson install + ( cd DESTDIR && find . -ls) + ;; esac # vim:set sw=4 sts=4 et: diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 48197c52..0d93566b 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -169,6 +169,8 @@ case "$ci_distro" in libselinux1-dev libsystemd-dev libx11-dev + meson + ninja-build sudo valgrind wget @@ -206,6 +208,7 @@ case "$ci_distro" in automake cmake libtool + meson ) # docs @@ -272,7 +275,7 @@ case "$ci_distro" in "${packages[@]}" mingw${bits}-cross-gcc-c++ mingw${bits}-libexpat-devel - mingw${bits}-glib2-devel + mingw${bits}-cross-meson ) ;; diff --git a/tools/docker/windows/Dockerfile b/tools/docker/windows/Dockerfile index c9a91200..bff4c501 100644 --- a/tools/docker/windows/Dockerfile +++ b/tools/docker/windows/Dockerfile @@ -29,7 +29,7 @@ RUN (New-Object System.Net.WebClient).DownloadString('https://wrapdb.mesonbuild. RUN (New-Object System.Net.WebClient).DownloadString('https://zlib.net/fossils/') >$null # MinGW environment -RUN c:\msys64\usr\bin\bash -lc 'pacman -S --noconfirm mingw-w64-ucrt-x86_64-toolchain expat glib2-devel' +RUN c:\msys64\usr\bin\bash -lc 'pacman -S --noconfirm mingw-w64-ucrt-x86_64-toolchain expat glib2-devel ninja' # Visual Studio can't be installed with choco. # It depends on dotnetfx v4.8.0.20190930, which requires a reboot: dotnetfx (exit code 3010) |