[gjs: 5/5] Merge branch 'merge' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 5b5d141c543d132a4f72a53ea866a6c347bd48da
Merge: ee3b513 b14c086
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Mar 25 18:41:14 2018 +0000

    Merge branch 'merge' into 'master'
    
    Robustness of CI
    
    See merge request GNOME/gjs!103

 .gitlab-ci.yml  | 31 +++++++++++++++++--------------
 test/test-ci.sh | 26 +++++++++++++++-----------
 2 files changed, 32 insertions(+), 25 deletions(-)
---