[gjs: 1/2] CI: use Ubuntu in the coverage job

[Philip Chimento <pchimento src gnome org>]

commit a2465526f67aa108d26828792935a6cfbba5e9c9
Author: Claudio André <claudioandre br gmail com>
Date:   Sun Jun 10 19:40:18 2018 -0300

    CI: use Ubuntu in the coverage job
    
    Fedora devel is buggy.

 .gitlab-ci.yml  | 3 +--
 test/test-ci.sh | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0bb44df..b799625f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,9 +144,8 @@ coverage:
   <<: *build
   <<: *coverage
   stage: thorough_tests
-  image: claudioandre/spidermonkey:fedora.27.gcc
+  image: claudioandre/spidermonkey:ubuntu.dev.gcc
   variables:
-    DEV: jhbuild
     BUILD_OPTS: "--enable-code-coverage"
     coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
   except:
diff --git a/test/test-ci.sh b/test/test-ci.sh
index e663ce0a..2138fee1 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -212,12 +212,12 @@ elif [[ $1 == "GJS_COVERAGE" ]]; then
     do_Print_Labels 'Code Coverage Report'
     do_Set_Env
 
-    jhbuild run --in-builddir=gjs make check-code-coverage
-    cp "$(pwd)"/.cache/jhbuild/build/gjs/gjs-?.*.*-coverage.info "$save_dir"/coverage/
-    cp -r "$(pwd)"/.cache/jhbuild/build/gjs/gjs-?.*.*-coverage/* "$save_dir"/coverage/
+    make check-code-coverage
+    cp "$(pwd)"/gjs-?.*.*-coverage.info "$save_dir"/coverage/
+    cp -r "$(pwd)"/gjs-?.*.*-coverage/* "$save_dir"/coverage/
 
     echo '-----------------------------------------'
-    sed -e 's/<[^>]*>//g' "$(pwd)"/coverage/index.html | tr -d ' \t' | grep -A3 -P '^Lines:$'  | tr '\n' ' 
'; echo
+    sed -e 's/<[^>]*>//g' "$save_dir"/coverage/index.html | tr -d ' \t' | grep -A3 -P '^Lines:$'  | tr '\n' 
' '; echo
     echo '-----------------------------------------'
 
 elif [[ $1 == "CPPCHECK" && "$log_message" != *'[skip cppcheck]'* ]]; then