[gjs: 2/2] Merge branch 'clang' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 0ffda39d90ce5f215bffbb010f02671f49bd41f1
Merge: 14294808 a023b6f6
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Jul 20 01:38:37 2018 +0000

    Merge branch 'clang' into 'master'
    
    CI: stop using Fedora for clang builds
    
    See merge request GNOME/gjs!198

 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --cc .gitlab-ci.yml
index 364debef,35f58503..4bb84670
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -154,13 -148,12 +154,13 @@@ sanitizer_gcc
  with_logging:
    <<: *build
    stage: test
-   image: claudioandre/spidermonkey:new-342.4  # temporarily pinned to old tag
+   image: claudioandre/spidermonkey:SM52-gcc.ubuntu-dev
    variables:
-     TASK_ID: "fedora-x86_64-clang-default-logging-check"
+     TASK_ID: "ubuntu-x86_64-clang-default-logging-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_CLOSURE=1 
-DGJS_VERBOSE_ENABLE_GSIGNAL=1'
 +    BUILD_OPTS: "--disable-readline 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'"
      TEST: "check"
 +    SCRIPTCHECK: "yes"
    except:
      - schedules
  
@@@ -304,11 -285,11 +304,11 @@@ code_statistics
  sanitizer_clang:
    <<: *build
    stage: thorough_tests
-   image: claudioandre/spidermonkey:new-342.4  # temporarily pinned to old tag
+   image: claudioandre/spidermonkey:SM52-gcc.ubuntu-dev
    variables:
-     TASK_ID: "fedora-x86_64-clang_ubsan_asan-default-default-check"
+     TASK_ID: "ubuntu-x86_64-clang_ubsan_asan-default-default-check"
      CC: clang
 -    BUILD_OPTS: "--enable-asan --enable-ubsan"
 +    BUILD_OPTS: "--enable-asan --enable-ubsan --disable-readline"
      TEST: "check"
    only:
      variables:
@@@ -523,11 -504,11 +523,11 @@@ coverage
  sanitizer_clang:
    <<: *build
    stage: manual
-   image: claudioandre/spidermonkey:new-342.4  # temporarily pinned to old tag
+   image: claudioandre/spidermonkey:SM52-gcc.ubuntu-dev
    variables:
-     TASK_ID: "fedora-x86_64-clang_ubsan_asan-default-default-check"
+     TASK_ID: "ubuntu-x86_64-clang_ubsan_asan-default-default-check"
      CC: clang
 -    BUILD_OPTS: "--enable-asan --enable-ubsan"
 +    BUILD_OPTS: "--enable-asan --enable-ubsan --disable-readline"
      TEST: "check"
    when: manual
    except: