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

[Will Thompson <wjt src gnome org>]

commit f0a1eadb04334935e2fabe5751eac0df9b0a1c15
Author: Will Thompson <wjt endlessm com>
Date:   Mon Aug 24 14:30:34 2020 +0100

    Revert "ci: Only build Malcontent for maximal build"
    
    This reverts commit 943091b732f07ce4503ce1d562939e3630ca3d1d.

 .gitlab-ci.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90d8fc04..a6f20c52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,15 @@ 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.
@@ -74,16 +83,6 @@ 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'