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



commit c7c20c4be8fd3a7d449e4f0b685812f9c732582a
Merge: b27223ba 417be665
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat May 5 21:00:26 2018 +0000

    Merge branch 'tweaks' into 'master'
    
    More tweaks
    
    See merge request GNOME/gjs!136

 .gitlab-ci.yml  |  29 ++++++-----
 test/test-ci.sh | 155 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 101 insertions(+), 83 deletions(-)
---
diff --cc test/test-ci.sh
index 90d68eb3,e735a0ff..badccfe6
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@@ -44,15 -60,14 +60,15 @@@ function do_Build_Package_Dependencies(
  
  function do_Show_Info(){
  
-     echo '--------------------------------'
+     echo '-----------------------------------------'
      echo 'Useful build system information'
      echo -n "Processors: "; grep -c ^processor /proc/cpuinfo
 +    grep ^MemTotal /proc/meminfo
      id; uname -a
      printenv
-     echo '--------------------------------'
+     echo '-----------------------------------------'
      cat /etc/*-release
-     echo '--------------------------------'
+     echo '-----------------------------------------'
  
      if [[ ! -z $CC ]]; then
          echo 'Compiler version'


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