Run logs - Add more groups to condense output (#16)

Author: MSP-Greg

common.rb

@@ -26,7 +26,7 @@ module Common
   RED   = "\e[91m"
   YEL   = "\e[93m"
   RST   = "\e[0m"
-  END_GROUP = "##[endgroup]\n\n"
+  END_GROUP = "##[endgroup]\n"
 
   # Repo specific constants
   TAG = 'msys2-gcc-pkgs' # GitHub release tag
@@ -304,7 +304,7 @@ def gpg_conf_key_server(old_uri, new_uri)
   end
 
   def refresh_keys
-    STDOUT.syswrite "\n#{YEL}#{LINE} Refresh keys#{RST}\n"
+    STDOUT.syswrite "\n##[group]#{YEL}#{LINE} Refresh keys#{RST}\n"
     gpg_conf_key_server 'keyserver.ubuntu.com', 'keys.openpgp.org'
 
     str = ''
@@ -314,7 +314,8 @@ def refresh_keys
 
     system 'taskkill /f /fi "MODULES eq msys-2.0.dll"'
 
-    STDOUT.syswrite str
+    STDOUT.syswrite "#{str}\n#{END_GROUP}"
+    
     str.match?(/new signatures:|signatures cleaned:/) ? true : nil
   end
 
@@ -328,21 +329,22 @@ def pacman_syuu(ignore = nil)
 
     cmd = "#{PACMAN} -Syuu --disable-download-timeout --noconfirm #{ignore}"
 
-    exec_check 'Updating all installed packages', cmd
-
+    exec_check 'Updating all installed packages', cmd, false
     system 'taskkill /f /fi "MODULES eq msys-2.0.dll"'
+    STDOUT.syswrite END_GROUP
 
-    exec_check 'Updating all installed packages (2nd pass)', cmd
-
+    exec_check 'Updating all installed packages (2nd pass)', cmd, false
     system 'taskkill /f /fi "MODULES eq msys-2.0.dll"'
+    STDOUT.syswrite END_GROUP
 
     refresh_keys
   end
 
   # logs message and runs cmd, checking for error
-  def exec_check(msg, cmd)
-    STDOUT.syswrite "\n#{YEL}#{LINE} #{msg}#{RST}\n"
+  def exec_check(msg, cmd, write_group_end = true)
+    STDOUT.syswrite "\n##[group]#{YEL}#{LINE} #{msg}#{RST}\n"
     exit 1 unless system cmd
+    STDOUT.syswrite END_GROUP if write_group_end
   end
 
   def log_array_2_column(ary, wid, hdr)

create_gcc_pkg.rb

@@ -52,7 +52,7 @@ def add_ri2_key
       key = 'F98B8484BE8BF1C5'
       exec_check "pacman-key --init", "bash.exe -c \"pacman-key --init\""
       exec_check "Get RI2 Key" , "bash.exe -c \"pacman-key --recv-keys #{key}\""
-      exec_check "Sign RI2 Key", "bash.exe -c \"pacman-key --lsign-key #{key}\""
+      exec_check "Sign RI2 Key", "bash.exe -c \"pacman-key --lsign-key #{key}\"", false
     end
 
     def openssl_downgrade
@@ -68,6 +68,8 @@ def openssl_downgrade
       download pkg    , "./#{PKG_PRE}#{pkg_name}"
       download pkg_sig, "./#{PKG_PRE}#{pkg_name}.sig"
 
+      STDOUT.syswrite END_GROUP
+
       # install package
       exec_check "Install OpenSSL Downgrade", "pacman.exe -Udd --noconfirm --noprogressbar #{PKG_PRE}#{pkg_name}"
 

create_msys2_pkg.rb

@@ -33,7 +33,7 @@ def update_msys2
       updated_keys = pacman_syuu
 
       pkgs = 'autoconf-wrapper autogen automake-wrapper bison diffutils libtool m4 make patch re2c texinfo texinfo-tex compression'
-      exec_check "Install MSYS2 packages#{RST}\n#{YEL}#{pkgs}",
+      exec_check "Install MSYS2 Packages#{RST}\n#{YEL}#{pkgs}",
         "#{PACMAN} -S --noconfirm --needed --noprogressbar #{pkgs}"
       updated_keys
     end