[gnome-initial-setup/wip/wjt/ci-malcontent] ci: Only build Malcontent in maximal configuration



commit cbfba2b6392b28faedb64881888308bcc92bac6e
Author: Will Thompson <wjt endlessm com>
Date:   Mon Aug 24 14:32:00 2020 +0100

    ci: Only build Malcontent in maximal configuration

 .gitlab-ci.yml                   | 9 ++-------
 .gitlab-ci/install-malcontent.sh | 7 +++++++
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6f20c52..4f4c764e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,13 +47,8 @@ before_script:
   script:
     # FIXME: We can’t install malcontent via dnf until it’s packaged in Fedora,
     # so build it manually.
-    - git clone https://gitlab.freedesktop.org/pwithnall/malcontent.git ./malcontent
-    - pushd ./malcontent
-    - git checkout tags/0.6.0
-    - meson setup ${MESON_COMMON_OPTIONS} --prefix /usr _build
-    - ninja -C _build
-    - sudo ninja -C _build install
-    - popd
+    - if $EXPLICIT_FEATURES; then . ./.gitlab-ci/install-malcontent.sh; fi
+
     # In general, we would like warnings to be fatal. However, code copied from
     # gnome-control-center uses many deprecated functions. Until we have a good
     # answer to sharing that code (#68), make those warnings non-fatal.
diff --git a/.gitlab-ci/install-malcontent.sh b/.gitlab-ci/install-malcontent.sh
new file mode 100644
index 00000000..d3629bb3
--- /dev/null
+++ b/.gitlab-ci/install-malcontent.sh
@@ -0,0 +1,7 @@
+git clone https://gitlab.freedesktop.org/pwithnall/malcontent.git ./malcontent
+pushd ./malcontent
+git checkout tags/0.6.0
+meson setup --prefix /usr _build
+ninja -C _build
+sudo ninja -C _build install
+popd


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]