[gjs: 1/3] CI: reorganize the yaml file (no-op)

[Philip Chimento <pchimento src gnome org>]

commit 07ee6b9fa394d12e890bd0f391effdff9b5639e4
Author: Claudio André <claudioandre br gmail com>
Date:   Mon Jun 11 09:49:31 2018 -0300

    CI: reorganize the yaml file (no-op)

 .gitlab-ci.yml | 91 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 46 insertions(+), 45 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b799625f..485f22d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,25 +97,6 @@ fedora:
 #############################################
 # Regular tests
 #############################################
-ubuntu_gcc:
-  <<: *build
-  stage: test
-  image: claudioandre/spidermonkey:ubuntu.dev.gcc
-  variables:
-    TEST: "distcheck"
-  only:
-    - master@GNOME/gjs
-
-ubuntu_clang:
-  <<: *build
-  stage: test
-  image: claudioandre/spidermonkey:ubuntu.dev.gcc
-  variables:
-    CC: clang
-    TEST: "distcheck"
-  only:
-    - master@GNOME/gjs
-
 fedora_clang:
   <<: *build
   stage: test
@@ -140,17 +121,6 @@ installed_tests:
     CC: clang
     BUILD_OPTS: "--enable-installed-tests --prefix=/usr"
 
-coverage:
-  <<: *build
-  <<: *coverage
-  stage: thorough_tests
-  image: claudioandre/spidermonkey:ubuntu.dev.gcc
-  variables:
-    BUILD_OPTS: "--enable-code-coverage"
-    coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
-  except:
-    - /^wip\/.*/
-
 sanitizer_gcc:
   <<: *build
   stage: thorough_tests
@@ -169,6 +139,52 @@ with_logging:
   variables:
     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_CLOSURE=1 
-DGJS_VERBOSE_ENABLE_GSIGNAL=1'
 
+# Generates
+# The Code Coverage Report
+coverage:
+  <<: *build
+  <<: *coverage
+  stage: thorough_tests
+  image: claudioandre/spidermonkey:ubuntu.dev.gcc
+  variables:
+    BUILD_OPTS: "--enable-code-coverage"
+    coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
+  except:
+    - /^wip\/.*/
+
+# Publish
+# The Coverage Report generated above
+pages:
+  stage: delivery
+  dependencies:
+    - coverage
+  script:
+    - mv $(pwd)/coverage/ public/
+  artifacts:
+    paths:
+      - public
+  only:
+    - master@GNOME/gjs
+
+ubuntu_gcc:
+  <<: *build
+  stage: test
+  image: claudioandre/spidermonkey:ubuntu.dev.gcc
+  variables:
+    TEST: "distcheck"
+  only:
+    - master@GNOME/gjs
+
+ubuntu_clang:
+  <<: *build
+  stage: test
+  image: claudioandre/spidermonkey:ubuntu.dev.gcc
+  variables:
+    CC: clang
+    TEST: "distcheck"
+  only:
+    - master@GNOME/gjs
+
 sanitizer_clang:
   <<: *build
   stage: thorough_tests
@@ -228,21 +244,6 @@ code_statistics:
   only:
     - master@GNOME/gjs
 
-#############################################
-# Publish the Code Coverage Report
-#############################################
-pages:
-  stage: delivery
-  dependencies:
-    - coverage
-  script:
-    - mv $(pwd)/coverage/ public/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master@GNOME/gjs
-
 #############################################
 # Optional / Manual CI tests
 #############################################