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 /.gitlab-ci.yml | |
| 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 '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5591da74..ee993cf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - WINDOWS_TAG: "2022-01-07.1" + WINDOWS_TAG: "2022-02-06.2" UPSTREAM_BRANCH: 'master' UPSTREAM_REPO: 'dbus/dbus' @@ -77,6 +77,17 @@ variables: reports: junit: $CI_PROJECT_DIR/test-results.xml +.meson-common: + variables: + ci_buildsys: "meson" + artifacts: + reports: + junit: "$builddir/meson-logs/testlog.junit.xml" + name: "dbus-$CI_JOB_NAME" + when: always + paths: + - "$builddir/meson-logs/testlog.txt" + windows amd64 image: stage: "build docker" variables: @@ -165,6 +176,13 @@ debian cmake: variables: ci_buildsys: "cmake-dist" +debian meson: + extends: + - .meson-common + - .debian-build + variables: + builddir: "ci-build-production-native" + debian mingw32 autotools debug: extends: .debian-build variables: @@ -240,6 +258,16 @@ opensuse mingw64 cmake debug: ci_local_packages: "no" ci_variant: "debug" +opensuse mingw64 meson debug: + extends: + - .meson-common + - .suse-build + variables: + ci_host: "x86_64-w64-mingw32" + ci_local_packages: "no" + ci_variant: "debug" + builddir: "ci-build-$ci_variant-$ci_host" + .ubuntu-build: extends: .unix-host-build image: "ubuntu:latest" @@ -290,4 +318,24 @@ windows vs15-64 cmake: # FIXME: a few tests timeout on gitlab runner for unknown reason - cd build ; ctest -C Debug -VV --timeout 1200 -E '(dbus-daemon|monitor)' --output-junit $ci_cmake_junit_output +windows-meson-mingw-ucrt64: + extends: .win-build + script: + - $env:MSYSTEM = "UCRT64" + - $env:CHERE_INVOKING = "1" + - $env:MSYS2_PATH_TYPE = "inherit" + - $env:PATH += ";C:\msys64\usr\bin" + # FIXME: -j1: for some reason on CI ninja: fatal: pipe: Too many open files + - C:\msys64\usr\bin\bash -lc " + meson build && + ninja -j1 -C build && + meson test -C build" + +windows-meson-vs15-x86: + extends: .win-build + script: + - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=x86 && + meson build && + meson test -C build" + # vim:set sw=2 sts=2 et: |