[mutter] ci: Use backend-agnostic meson command to build
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] ci: Use backend-agnostic meson command to build
- Date: Sun, 22 Aug 2021 17:56:07 +0000 (UTC)
commit 7eb68b43a977ac7fd2f111443b007a29b1dd781c
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Aug 5 14:57:09 2021 +0200
ci: Use backend-agnostic meson command to build
There's no alternative backend in sight for us, but it's nice to
only deal with a single build tool.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957>
.gitlab-ci.yml | 16 ++++++++--------
.gitlab-ci/install-meson-project.sh | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9fc1df997..436835ceb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,8 +146,8 @@ build-fedora-container@aarch64:
stage: build
script:
- meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true
--werror --prefix /usr
- - ninja -C build
- - ninja -C build install
+ - meson compile -C build
+ - meson install -C build
artifacts:
expire_in: 1 day
paths:
@@ -176,8 +176,8 @@ build-without-opengl-and-glx@x86_64:
- build-fedora-container@x86_64
script:
- meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true
-Dwayland_eglstream=true --werror --prefix /usr
- - ninja -C build
- - ninja -C build install
+ - meson compile -C build
+ - meson install -C build
artifacts:
paths:
- build/meson-logs
@@ -191,8 +191,8 @@ build-without-native-backend-and-wayland@x86_64:
- build-fedora-container@x86_64
script:
- meson . build -Dbuildtype=debugoptimized -Dnative_backend=false -Dudev=false -Dwayland=false
-Dcore_tests=false -Dnative_tests=false --werror --prefix /usr
- - ninja -C build
- - ninja -C build install
+ - meson compile -C build
+ - meson install -C build
artifacts:
paths:
- build/meson-logs
@@ -271,7 +271,7 @@ can-build-gnome-shell@x86_64:
script:
- .gitlab-ci/checkout-gnome-shell.sh
- meson gnome-shell gnome-shell/build --prefix /usr -Dman=false
- - ninja -C gnome-shell/build install
+ - meson install -C gnome-shell/build
test-mutter-coverity:
rules:
@@ -288,7 +288,7 @@ test-mutter-coverity:
script:
- .gitlab-ci/download-coverity-tarball.sh
- CC=clang meson coverity-build -Dprofiler=false
- - ./coverity/cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C coverity-build
+ - ./coverity/cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C coverity-build
- tar czf cov-int.tar.gz cov-int
- curl https://scan.coverity.com/builds?project=mutter
--form token=$COVERITY_TOKEN --form email=carlosg gnome org
diff --git a/.gitlab-ci/install-meson-project.sh b/.gitlab-ci/install-meson-project.sh
index 575410b134..bf0f9e2b78 100755
--- a/.gitlab-ci/install-meson-project.sh
+++ b/.gitlab-ci/install-meson-project.sh
@@ -33,7 +33,7 @@ if [ ! -z "$COMMIT" ]; then
fi
meson --prefix=/usr _build "${MESON_OPTIONS[@]}"
-ninja -C _build install
+meson install -C _build
popd
popd
rm -rf "$REPO_DIR"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]