[gjs: 4/4] Merge branch 'master' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 9779a86eefc250e47e4e72fb80c07e5506e3ba96
Merge: 58f328af cb498acb
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Jun 9 19:20:09 2018 +0000

    Merge branch 'master' into 'master'
    
    CI Tweaks
    
    See merge request GNOME/gjs!160

 .gitlab-ci.yml               | 56 ++++++++++++++++++++------------------------
 test/extra/do_environment.sh | 15 +++++++-----
 test/test-ci.sh              |  6 ++---
 3 files changed, 38 insertions(+), 39 deletions(-)
---