[前][次][番号順一覧][スレッド一覧]

ruby-changes:70597

From: Nobuyoshi <ko1@a...>
Date: Sun, 26 Dec 2021 15:38:27 +0900 (JST)
Subject: [ruby-changes:70597] 1698010bb1 (master): NEWS: Empty gem list if no new gems

https://git.ruby-lang.org/ruby.git/commit/?id=1698010bb1

From 1698010bb12a799f8ceb7202fd0df87cc41c6a48 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 26 Dec 2021 15:35:22 +0900
Subject: NEWS: Empty gem list if no new gems

---
 .github/workflows/bundled_gems.yml | 14 ++++++++------
 .github/workflows/check_misc.yml   |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml
index 12fb2b06e5d..2a8e6c244c3 100644
--- a/.github/workflows/bundled_gems.yml
+++ b/.github/workflows/bundled_gems.yml
@@ -67,12 +67,14 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/bundled_gems.yml#L67
               [g, v] unless last[g] == v
             end
             changed, added = changed.partition {|g, _| last[g]}
-            news.sub!(/^\*\s+The following #{type} gems? are updated\.(\n\s+\*\s+)\K.*(?:\1.*)*/) do
-              changed.map {|g, v|"#{g} #{v}"}.join($1)
-            end or exit
-            news.sub!(/^\*\s+The following default gems are now bundled.*(\n\s+\*\s+)\K.*(?:\1.*)*/) do
-              added.map {|g, v|"#{g} #{v}"}.join($1)
-            end if added
+            news.sub!(/^\*( +)The following #{type} gems? are updated\.\n\K(?: \1\* .*\n)*/) do
+              mark = "#{$1} * "
+              changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
+            end or next
+            news.sub!(/^\*( +)The following default gems are now bundled gems\.\n\K(?: \1\* .*\n)*/) do
+              mark = "#{$1} * "
+              added.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
+            end or next if added
             File.write("NEWS.md", news)
           end
         shell: ruby {0}
diff --git a/.github/workflows/check_misc.yml b/.github/workflows/check_misc.yml
index 17404746c54..2872c96ffd3 100644
--- a/.github/workflows/check_misc.yml
+++ b/.github/workflows/check_misc.yml
@@ -72,9 +72,10 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/check_misc.yml#L72
               g, v = l.split(" ", 3)
               [g, v] unless last[g] == v
             end
-            news.sub!(/^\*\s+The following #{type} gems? are updated\.(\n\s+\*\s+)\K.*(?:\1.*)*/) do
-              changed.map {|g, v|"#{g} #{v}"}.join($1)
-            end or exit
+            news.sub!(/^\*( +)The following #{type} gems? are updated\.\n\K(?: \1\* .*\n)*/) do
+              mark = "#{$1} * "
+              changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
+            end or next
             File.write("NEWS.md", news)
           end
         shell: ruby {0}
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]