diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15f59af..e016f39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ variables: before_script: - echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories - apk update - - apk add musl-dev eudev-libs eudev-dev linux-headers cmake ninja gcc scdoc + - apk add musl-dev eudev-libs eudev-dev linux-headers meson ninja gcc scdoc - apk add libxcb-dev xcb-util-wm-dev xcb-util-cursor-dev cairo-dev yaml-dev - apk add wayland-dev wayland-protocols wlroots-dev - apk add json-c-dev libmpdclient-dev alsa-lib-dev @@ -19,7 +19,7 @@ debug: script: - mkdir -p bld/debug - cd bld/debug - - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../../ + - meson --buildtype=debug ../.. - ninja -k0 release: @@ -27,7 +27,7 @@ release: script: - mkdir -p bld/release - cd bld/release - - cmake -G Ninja -DCMAKE_BUILD_TYPE=MinSizeRel ../../ + - meson --buildtype=minsize ../../ - ninja -k0 x11_only: @@ -35,7 +35,7 @@ x11_only: script: - mkdir -p bld/debug - cd bld/debug - - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DENABLE_X11=yes -DENABLE_WAYLAND=no ../../ + - meson --buildtype=debug -Dbackend-x11=enabled -Dbackend-wayland=disabled ../../ - ninja -k0 wayland_only: @@ -43,7 +43,7 @@ wayland_only: script: - mkdir -p bld/debug - cd bld/debug - - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DENABLE_X11=no -DENABLE_WAYLAND=yes ../../ + - meson --buildtype=debug -Dbackend-x11=disabled -Dbackend-wayland=enabled ../../ - ninja -k0 plugins_as_shared_modules: @@ -51,5 +51,5 @@ plugins_as_shared_modules: script: - mkdir -p bld/debug - cd bld/debug - - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCORE_PLUGINS_AS_SHARED_LIBRARIES=yes ../../ + - meson --buildtype=debug -Dcore-plugins-as-shared-libraries=true ../../ - ninja -k0