From 7b6bcb6e7a77b1015dd0ea8dbef2c749123da82f Mon Sep 17 00:00:00 2001
From: Gabriel Nagy <gabriel.nagy@puppet.com>
Date: Fri, 1 Oct 2021 12:15:59 +0300
Subject: (MODULES-11197) Allow release prep commits in rake task

Update changelog to match new tags.
---
 .sync.yml            | 3 ---
 CHANGELOG.md         | 4 ++--
 Rakefile             | 2 +-
 rakelib/commits.rake | 3 ++-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index ff66415..ee6e834 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -54,6 +54,3 @@ appveyor.yml:
   unmanaged: false
 .gitlab-ci.yml:
   delete: true
-
-Rakefile:
-  changelog_version_tag_pattern: '%s'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1dc27b..8acecbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,9 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [1.2.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.2.0) (2021-10-01)
+## [v1.2.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/v1.2.0) (2021-10-01)
 
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.1.2...1.2.0)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.1.2...v1.2.0)
 
 ### Added
 
diff --git a/Rakefile b/Rakefile
index 23e44bf..2906c15 100644
--- a/Rakefile
+++ b/Rakefile
@@ -35,7 +35,7 @@ end
 
 def changelog_future_release
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = "%s" % JSON.load(File.read('metadata.json'))['version']
+  returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
   raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator future_release:#{returnVal}"
   returnVal
diff --git a/rakelib/commits.rake b/rakelib/commits.rake
index a900ee2..42eb209 100644
--- a/rakelib/commits.rake
+++ b/rakelib/commits.rake
@@ -7,7 +7,7 @@ task(:commits) do
   %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
     # This regex tests for the currently supported commit summary tokens.
     # The exception tries to explain it in more full.
-    if /^\((maint|packaging|doc|docs|modules-\d+)\)|revert/i.match(commit_summary).nil?
+    if /^Release prep|\((maint|packaging|doc|docs|modules-\d+)\)|revert/i.match(commit_summary).nil?
       raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
         "\n\t\t#{commit_summary}\n" \
         "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
@@ -16,6 +16,7 @@ task(:commits) do
         "\t\t(docs)(DOCUMENT-<digits>)\n" \
         "\t\t(packaging)\n"
         "\t\t(maint)\n" \
+        "\t\tRelease prep v<tag>\n" \
         "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
     else
       puts "#{commit_summary}"
-- 
cgit v1.2.3