[grilo-plugins/sam/grilo-subproject: 5/5] ci: Use subproject feature to build Grilo
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins/sam/grilo-subproject: 5/5] ci: Use subproject feature to build Grilo
- Date: Sun, 6 Oct 2019 18:59:00 +0000 (UTC)
commit 0ef394e8708e06ff4c2eccb63339ab7e74ba33b3
Author: Sam Thursfield <sam afuera me uk>
Date: Mon Sep 30 13:45:48 2019 +0200
ci: Use subproject feature to build Grilo
We can now rely on Meson to clone and build grilo.git as part
of the grilo-plugins build, so we can simplify the CI script.
.gitlab-ci.yml | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e449952b..40c52576 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,17 +17,11 @@ variables:
build_stable:
before_script:
- dnf update -y --nogpgcheck
- - dnf install -y --nogpgcheck $DEPENDENCIES_GRILO
- # Build grilo from git, grilo and grilo-plugins must be in sync
- - git clone https://gitlab.gnome.org/GNOME/grilo.git
- - cd grilo
- - meson . _build --prefix=/usr
- - ninja -C _build
- - ninja -C _build install
- - cd ..
script:
- - dnf install -y --nogpgcheck $DEPENDENCIES
+ - dnf install -y --nogpgcheck $DEPENDENCIES_GRILO $DEPENDENCIES
+ # As part of configuring grilo-plugins.git for build, the latest code from
+ # grilo.git will be fetched by Meson and it will be built as a subproject.
- meson . _build --prefix=/usr
- ninja -C _build
- ninja -C _build install
- - ninja -C _build test
+ - meson test -C _build --suite=grilo-plugins
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]