[gjs: 5/12] CI: Organize build jobs into recommended, minimal, and maximal

[Cosimo Cecchi <cosimoc src gnome org>]

commit 30dd2ce37f31d3f25c213ead6d8942ac3763ee6e
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Aug 14 23:04:40 2019 -0700

    CI: Organize build jobs into recommended, minimal, and maximal
    
    Since jobs fail a lot on our CI, it makes more sense to build fewer of
    them. This renames the "fedora" job in the first phase to
    "build_recommended" and makes its arguments explicit. In the second
    phase it consolidates all of the builds with feature X turned on or off
    into two "build_minimal" and "build_maximal" jobs.
    
    It turns out that we have not been building the profiler at all in CI
    recently because the sysprof-capture-3 package isn't available. Disable
    it explicitly for now, with a fixme note.
    
    For this reason we also have to run build_maximal on Fedora, since there
    isn't a sysprof package available for Ubuntu yet. We run build_minimal
    on Ubuntu instead.

 .gitlab-ci.yml | 62 ++++++++++++++++++----------------------------------------
 1 file changed, 19 insertions(+), 43 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77db39c9..39ce87c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,7 +126,7 @@ stages:
 #############################################
 # Test despite any changes in the Docker image
 # SpiderMonkey has been configured with --enable-debug
-fedora:
+build_recommended:
   <<: *build
   stage: source_check
   image: registry.gitlab.gnome.org/gnome/gjs:job-286759_SM60-debug-gcc.fedora-dev  # pinned on purpose
@@ -134,6 +134,10 @@ fedora:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check"
     TEST: "check"
     WARNINGS: "count"
+    # FIXME: Add --enable-profiler
+    BUILD_OPTS: >-
+      --with-cairo --enable-readline
+      --disable-dtrace --disable-systemtap
   except:
     - schedules
 
@@ -151,62 +155,34 @@ sanitizer_gcc:
 # There are a lot of debug log statements that are ifdef'd out in normal usage.
 # These sometimes get invalid expressions in them, leading to annoyance the
 # next time you try to use debug logging.
-with_logging:
+build_maximal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
-    TASK_ID: "ubuntu-x86_64-clang-default-logging-check"
+    TASK_ID: "fedora-x86_64-clang-default-maximal-check"
     CC: clang
-    BUILD_OPTS: "CPPFLAGS='-DGJS_VERBOSE_ENABLE_PROPS=1 -DGJS_VERBOSE_ENABLE_MARSHAL=1 
-DGJS_VERBOSE_ENABLE_LIFECYCLE=1 -DGJS_VERBOSE_ENABLE_GI_USAGE=1 -DGJS_VERBOSE_ENABLE_GCLOSURE=1 
-DGJS_VERBOSE_ENABLE_GSIGNAL=1'"
+    # FIXME: add --enable-profiler
+    BUILD_OPTS: >-
+      CPPFLAGS='-DGJS_VERBOSE_ENABLE_PROPS=1 -DGJS_VERBOSE_ENABLE_MARSHAL=1 -DGJS_VERBOSE_ENABLE_LIFECYCLE=1 
-DGJS_VERBOSE_ENABLE_GI_USAGE=1 -DGJS_VERBOSE_ENABLE_GCLOSURE=1 -DGJS_VERBOSE_ENABLE_GSIGNAL=1'
+      --with-cairo --enable-readline
+      --enable-dtrace --enable-systemtap
     TEST: "check"
     SCRIPTCHECK: "yes"
     ENABLE_GTK: "yes"
   except:
     - schedules
 
-with_systemtap:
+build_minimal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
-  variables:
-    TASK_ID: "fedora-x86_64-gcc-default-systemtap-check"
-    TEST: "check"
-    BUILD_OPTS: "--enable-systemtap"
-  except:
-    - schedules
-
-no_graphics:
-  <<: *build
-  stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
-  variables:
-    TASK_ID: "fedora-x86_64-gcc-default-without_gtk-check"
-    TEST: "check"
-    BUILD_OPTS: "--without-cairo --without-gtk-tests"
-    SCRIPTCHECK: "yes"
-  except:
-    - schedules
-
-no_profiler:
-  <<: *build
-  stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
-  variables:
-    TASK_ID: "fedora-x86_64-gcc-default-disable_profiler-check"
-    TEST: "check"
-    BUILD_OPTS: "--disable-profiler"
-  except:
-    - schedules
-
-no_readline:
-  <<: *build
-  stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
-    TASK_ID: "fedora-x86_64-gcc-default-disable_readline-check"
+    TASK_ID: "ubuntu-x86_64-gcc-default-minimal-check"
     TEST: "check"
-    BUILD_OPTS: "--disable-readline"
+    BUILD_OPTS: >-
+      --without-cairo --disable-profiler --disable-readline
+      --disable-dtrace --disable-systemtap
   except:
     - schedules