Merge pull request #4059 from rubygems/changelog_idempotency

Make changelog generation idempotent
rubygems · Nov 16, 2020 · fcdcfc0 · fcdcfc0
2 parents df7d88f + abf9c65
commit fcdcfc0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/util/changelog.rb b/util/changelog.rb
@@ -83,7 +83,7 @@ def cut!
       format_header,
       "",
       unreleased_notes,
-      lines,
+      released_notes,
     ].join("\n") + "\n"
 
     File.write(@file, full_new_changelog)
@@ -227,7 +227,7 @@ def relevant_pull_requests_for(ids)
   end
 
   def released_notes
-    lines.drop_while {|line| !line.start_with?(release_section_token) }
+    lines.drop_while {|line| !line.start_with?(release_section_token) || !line.include?(@latest_release.tag_name.gsub(/^.*-v/, "")) }
   end
 
   def lines