diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-06-22 02:02:04 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2021-08-03 11:13:23 +0000 |
| commit | d28aa365630d3be4d4f2948bac7babd206612b53 (patch) | |
| tree | f5e1e4118370dbcdb53f73d748ad34785423e07e /.gitlab-ci | |
| parent | ca08c495ad39ce9463dc39e47ce39710bbe757a0 (diff) | |
| download | weston-d28aa365630d3be4d4f2948bac7babd206612b53.tar.gz | |
CI: Use Meson to build Wayland
autotools has already been removed, so we should be doing this.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/build-deps.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index 26a5e612..c667b7bb 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -69,10 +69,9 @@ git clone --branch 1.18.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayla cd wayland git show -s HEAD mkdir build -cd build -../autogen.sh --disable-documentation -make install -cd ../../ +meson build -Ddocumentation=false +ninja ${NINJAFLAGS} -C build install +cd .. # Keep this version in sync with our dependency in meson.build. If you wish to # raise a MR against custom protocol, please change this reference to clone |