[glib: 3/3] Merge branch 'ci-meson-0-48' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 0e117cffa52a2311352652078553b19893496ee4
Merge: c824ffd37 24d7a73b9
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Sep 28 13:47:40 2018 +0000

    Merge branch 'ci-meson-0-48' into 'master'
    
    Ci meson 0 48
    
    See merge request GNOME/glib!347

 .gitlab-ci.yml            |  15 +++--
 .gitlab-ci/Dockerfile     |   2 +-
 .gitlab-ci/run-docker.sh  |   2 +-
 .gitlab-ci/test-msvc.bat  |   2 +-
 .gitlab-ci/test-msys2.sh  |   2 +-
 gio/tests/meson.build     | 160 ++++++++++++++++++++++------------------------
 meson.build               |   2 +-
 tests/gobject/meson.build |  70 ++++++++++----------
 tests/meson.build         |  74 ++++++++++-----------
 9 files changed, 157 insertions(+), 172 deletions(-)
---