build: Group build outputs

Author: kateinoigakukun

lib/ruby_wasm/build.rb

@@ -40,6 +40,28 @@ def system(*args, chdir: nil, out: nil, env: nil)
       raise e
     end
 
+    def begin_section(klass, name, note)
+      if ENV["GITHUB_ACTIONS"]
+        puts "::group::#{klass}(#{name}) -- #{note}"
+      else
+        puts "\e[1;36m==>\e[0m \e[1m#{klass}(#{name}) -- #{note}\e[0m"
+      end
+
+      # Record the start time
+      @start_times ||= Hash.new
+      @start_times[[klass, name]] = Time.now
+
+      $stdout.flush
+    end
+
+    def end_section(klass, name)
+      took = Time.now - @start_times[[klass, name]]
+      puts "\e[1;36m==>\e[0m \e[1m#{klass}(#{name}) -- done in #{took.round(2)}s\e[0m"
+      if ENV["GITHUB_ACTIONS"]
+        puts "::endgroup::"
+      end
+    end
+
     def rm_rf(list)
       FileUtils.rm_rf(list)
     end
@@ -69,7 +91,7 @@ def write(path, data)
     def _print_command(args, env)
       require "shellwords"
       # Bold cyan
-      print "\e[1;36m ==>\e[0m "
+      print "\e[1;36m  ==>\e[0m "
       print "env " + env.map { |k, v| "#{k}=#{v}" }.join(" ") + " " if env
       print args.map { |arg| Shellwords.escape(arg.to_s) }.join(" ") + "\n"
     end

lib/ruby_wasm/build/product/crossruby.rb

@@ -143,27 +143,37 @@ def configure(executor, reconfigure: false)
     end
 
     def build_exts(executor)
-      @user_exts.each { |prod| prod.build(executor, self) }
-      executor.mkdir_p File.dirname(extinit_obj)
-      executor.system "ruby",
-                      extinit_c_erb,
-                      *@user_exts.map(&:name),
-                      "--cc",
-                      toolchain.cc,
-                      "--output",
-                      extinit_obj
+      @user_exts.each do |prod|
+        executor.begin_section prod.class, prod.name, "Building"
+        prod.build(executor, self)
+        executor.end_section prod.class, prod.name
+      end
     end
 
     def build(executor, remake: false, reconfigure: false)
       executor.mkdir_p dest_dir
       executor.mkdir_p build_dir
       @toolchain.install
       [@source, @baseruby, @libyaml, @zlib, @openssl, @wasi_vfs].each do |prod|
+        executor.begin_section prod.class, prod.name, "Building"
         prod.build(executor)
+        executor.end_section prod.class, prod.name
       end
+      executor.begin_section self.class, name, "Configuring"
       configure(executor, reconfigure: reconfigure)
+      executor.end_section self.class, name
+
       build_exts(executor)
 
+      executor.begin_section self.class, name, "Building"
+      executor.mkdir_p File.dirname(extinit_obj)
+      executor.system "ruby",
+                      extinit_c_erb,
+                      *@user_exts.map(&:name),
+                      "--cc",
+                      toolchain.cc,
+                      "--output",
+                      extinit_obj
       install_dir = File.join(build_dir, "install")
       if !File.exist?(install_dir) || remake || reconfigure
         executor.system "make",
@@ -176,6 +186,8 @@ def build(executor, remake: false, reconfigure: false)
       executor.cp_r install_dir, dest_dir
       @user_exts.each { |ext| ext.do_install_rb(executor, self) }
       executor.system "tar", "cfz", artifact, "-C", "rubies", name
+
+      executor.end_section self.class, name
     end
 
     def clean(executor)

lib/ruby_wasm/build/product/libyaml.rb

@@ -25,7 +25,7 @@ def install_root
     end
 
     def name
-      product_build_dir
+      "libyaml-#{LIBYAML_VERSION}-#{target}"
     end
 
     def build(executor)

lib/ruby_wasm/build/product/openssl.rb

@@ -26,7 +26,7 @@ def install_root
     end
 
     def name
-      product_build_dir
+      "openssl-#{OPENSSL_VERSION}-#{target}"
     end
 
     def configure_args

lib/ruby_wasm/build/product/wasi_vfs.rb

@@ -39,7 +39,7 @@ def cli_bin_path
     end
 
     def name
-      lib_product_build_dir
+      "wasi-vfs-#{WASI_VFS_VERSION}-#{RbConfig::CONFIG["host"]}}"
     end
 
     def build(executor)

lib/ruby_wasm/build/product/zlib.rb

@@ -25,7 +25,7 @@ def install_root
     end
 
     def name
-      product_build_dir
+      "zlib-#{ZLIB_VERSION}-#{target}"
     end
 
     def configure_args

sig/ruby_wasm/build.rbs

@@ -223,6 +223,7 @@ module RubyWasm
 
   class BuildExecutor
     @verbose: bool
+    @start_times: Hash[[Class, String], Time]
 
     def initialize: (?verbose: bool) -> void
     def system: (*_ToS args, ?chdir: String?, ?out: Kernel::redirect_fd?, ?env: Hash[String, String]?) -> void
@@ -233,6 +234,9 @@ module RubyWasm
     def mkdir_p: (FileUtils::pathlist list) -> void
     def write: (String path, _ToS data) -> void
 
+    def begin_section: (Class klass, String name, String note) -> void
+    def end_section: (Class klass, String name) -> void
+
     private def _print_command: (Array[_ToS] command, Hash[String, String]? env) -> void
   end