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




commit 943091b732f07ce4503ce1d562939e3630ca3d1d
Author: Will Thompson <wjt endlessm com>
Date:   Mon Aug 24 12:58:45 2020 +0100

    ci: Only build Malcontent for maximal build
    
    This is currently failing, so doing this will allow at least half the CI
    to succeed (and run slightly faster). Part of the point of the minimal
    build is to check initial setup compiles with all optional features off,
    so not having malcontent present is perhaps an even better check.

 .gitlab-ci.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6f20c52..90d8fc04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,15 +45,6 @@ before_script:
 .job_template: &job_definition
   stage: build
   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
     # 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.
@@ -83,6 +74,16 @@ build-minimal:
 
 build-maximal:
   <<: *job_definition
+  before_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
   variables:
     EXPLICIT_FEATURES: 'true'
     AUTO_FEATURES: 'enabled'


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