[gjs: 10/10] Merge branch 'fix-ci-bugs' into 'master'



commit 5eb80e2dacc799c37208efc7fa7b6b4685377780
Merge: 2d59f7e4 0b443dc4
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Tue Feb 26 10:03:04 2019 +0000

    Merge branch 'fix-ci-bugs' into 'master'
    
    Fix CI failures
    
    See merge request GNOME/gjs!269

 .gitlab-ci.yml                 |  3 +--
 gi/boxed.cpp                   | 31 ++++++++++++++++++++++++----
 gjs/context.cpp                |  1 +
 gjs/importer.cpp               |  3 +--
 gjs/native.cpp                 | 47 ++++++++++++++----------------------------
 gjs/native.h                   |  4 +---
 installed-tests/extra/gjs.supp | 11 ++++++++++
 test/extra/do_basic.sh         |  2 +-
 test/org.gnome.GjsDevel.json   |  7 +++----
 test/test-ci.sh                | 12 ++++-------
 10 files changed, 65 insertions(+), 56 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]