From 2d889cead4813c9997980aa0ec7bcd8538d7345f Mon Sep 17 00:00:00 2001 From: Andrea Pappacoda Date: Tue, 23 Aug 2022 23:14:31 +0200 Subject: [PATCH] build: stop using meson's implicit setup command It will be deprecated in the next release, 0.64.0. See https://github.com/mesonbuild/meson/pull/10701 Signed-off-by: Andrea Pappacoda --- .gitlab-ci.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a35a64..c611b05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ build-gcc: extends: .fdo.distribution-image@alpine stage: "Build and test" script: - - CC=gcc meson build/ --fatal-meson-warnings -Dwerror=true -Db_coverage=true + - CC=gcc meson setup build/ --fatal-meson-warnings -Dwerror=true -Db_coverage=true - ninja -C build/ - ninja -C build/ test - ninja -C build/ -j1 coverage-xml coverage-html @@ -73,7 +73,7 @@ build-clang: extends: .fdo.distribution-image@alpine stage: "Build and test" script: - - CC=clang meson build/ --fatal-meson-warnings -Dwerror=true -Db_sanitize=address,undefined -Db_lundef=false + - CC=clang meson setup build/ --fatal-meson-warnings -Dwerror=true -Db_sanitize=address,undefined -Db_lundef=false - ninja -C build/ - ninja -C build/ test artifacts: diff --git a/README.md b/README.md index 0ef7494..4b696f2 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ follows the [freedesktop.org Contributor Covenant]. libdisplay-info is built using [Meson]. It has no dependencies. - meson build/ + meson setup build/ ninja -C build/ ## Testing