[gnome-shell] ci: Use backend-agnostic meson commands
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] ci: Use backend-agnostic meson commands
- Date: Tue, 24 Aug 2021 08:23:42 +0000 (UTC)
commit 0cd882697a1fd8f9928dc8546aeffe2ad095d0d4
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Aug 5 03:46:53 2021 +0200
ci: Use backend-agnostic meson commands
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/gnome-shell/-/merge_requests/1937>
.gitlab-ci.yml | 12 ++++++------
.gitlab-ci/install-meson-project.sh | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 898833f6a8..cecfdde7f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,11 +190,11 @@ build:
before_script:
- .gitlab-ci/checkout-mutter.sh
- meson mutter mutter/build --prefix=/usr
- - ninja -C mutter/build install
+ - meson install -C mutter/build
script:
- meson . build -Dbuildtype=debugoptimized -Dman=false --werror
- - ninja -C build
- - ninja -C build install
+ - meson compile -C build
+ - meson install -C build
artifacts:
expire_in: 1 day
paths:
@@ -208,7 +208,7 @@ test:
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
NO_AT_BRIDGE: "1"
before_script:
- - ninja -C mutter/build install
+ - meson install -C mutter/build
script:
- dbus-run-session -- xvfb-run meson test -C build --no-rebuild
artifacts:
@@ -226,11 +226,11 @@ test-coverity:
stage: analyze
allow_failure: true
before_script:
- - ninja -C mutter/build install
+ - meson compile -C mutter/build
script:
- .gitlab-ci/download-coverity-tarball.sh
- CC=clang meson coverity-build -Dman=false
- - ./coverity/cov-analysis-linux64-*/bin/cov-build --fs-capture-search js --dir cov-int ninja -C
coverity-build
+ - ./coverity/cov-analysis-linux64-*/bin/cov-build --fs-capture-search js --dir cov-int meson compile
-C coverity-build
- tar czf cov-int.tar.gz cov-int
- curl https://scan.coverity.com/builds?project=GNOME+Shell
--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 feea61149a..8aacfdd77d 100755
--- a/.gitlab-ci/install-meson-project.sh
+++ b/.gitlab-ci/install-meson-project.sh
@@ -28,7 +28,7 @@ pushd "$REPO_DIR"
pushd "$SUBDIR"
sh -c "$PREPARE"
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]