Use :: form workflow commands

ruby · Aug 15, 2023 · b76c2ec · b76c2ec
1 parent 9acc73d
commit b76c2ec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -78,9 +78,9 @@ jobs:
           mv /c/Windows/System32/libssl-1_1-x64.dll    /c/Windows/System32/libssl-1_1-x64.dll_
           result=true
           for e in gcc.exe ragel.exe make.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do
-            echo '##['group']'$'\033[93m'$e$'\033[m'
+            echo ::group::$'\033[93m'$e$'\033[m'
             where $e || result=false
-            echo '##['endgroup']'
+            echo ::endgroup::
           done
           $result
         working-directory:
@@ -91,9 +91,9 @@ jobs:
           result=true
           for e in gcc ragel make "openssl version"; do
             case "$e" in *" "*) ;; *) e="$e --version";; esac
-            echo '##['group']'$'\033[93m'$e$'\033[m'
+            echo ::group::$'\033[93m'$e$'\033[m'
             $e || result=false
-            echo '##['endgroup']'
+            echo ::endgroup::
           done
           $result
         working-directory:

diff --git a/defs/gmake.mk b/defs/gmake.mk
@@ -8,8 +8,9 @@ MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
 nproc = $(subst -j,,$(filter -j%,$(MFLAGS)))
 
 ifeq ($(GITHUB_ACTIONS),true)
-override ACTIONS_GROUP = @echo "\#\#[group]$(patsubst yes-%,%,$@)"
-override ACTIONS_ENDGROUP = @echo "\#\#[endgroup]"
+# 93(bright yellow) is copied from .github/workflows/mingw.yml
+override ACTIONS_GROUP = @echo "::group::[93m$(@:yes-%=%)[m"
+override ACTIONS_ENDGROUP = @echo "::endgroup::"
 endif
 
 ifneq ($(filter darwin%,$(target_os)),)

diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
@@ -23,7 +23,8 @@
   next if /^\s*(?:#|$)/ =~ line
   gem = line.split.first
   next if ARGV.any? {|pat| !File.fnmatch?(pat, gem)}
-  puts "#{github_actions ? "##[group]" : "\n"}Testing the #{gem} gem"
+  # 93(bright yellow) is copied from .github/workflows/mingw.yml
+  puts "#{github_actions ? "::group::\e\[93m" : "\n"}Testing the #{gem} gem#{github_actions ? "\e\[m" : ""}"
 
   test_command = "#{ruby} -C #{gem_dir}/src/#{gem} #{rake} test"
   first_timeout = 600 # 10min
@@ -88,7 +89,7 @@
     break
   end
 
-  print "##[endgroup]\n" if github_actions
+  print "::endgroup::\n" if github_actions
   unless $?.success?
 
     mesg = "Tests failed " +

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
@@ -547,8 +547,9 @@ GOLF_PRELUDE_C = golf_prelude.c
 RBCONFIG      = ./.rbconfig.time
 
 !if "$(GITHUB_ACTIONS)" == "true"
-ACTIONS_GROUP = @echo ^#^#[group]$(@:yes-=)
-ACTIONS_ENDGROUP = @echo ^#^#[endgroup]
+# 93(bright yellow) is copied from .github/workflows/mingw.yml
+ACTIONS_GROUP = @echo ::group::[93m$(@:yes-=)[m
+ACTIONS_ENDGROUP = @echo ::endgroup::
 !else
 ACTIONS_GROUP = @:: $(empty)
 ACTIONS_ENDGROUP = @::