[gjs: 3/3] Merge branch 'autotools' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 14166369e22437f0094ee453519d3c1b3d22fec4
Merge: c70d72f 39aaa43
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Mar 25 03:53:17 2018 +0000

    Merge branch 'autotools' into 'master'
    
    Create a CI test that builds using autotools only
    
    See merge request GNOME/gjs!74

 .gitlab-ci.yml           | 16 +++++++++++-----
 Makefile.am              |  1 +
 test/extra/do_jhbuild.sh |  1 +
 test/test-ci.sh          | 39 ++++++++++++++++++++++++++++++++-------
 4 files changed, 45 insertions(+), 12 deletions(-)
---