aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuchi <39198766+luchihoratiu@users.noreply.github.com>2021-10-01 05:53:49 -0400
committerGitHub <noreply@github.com>2021-10-01 05:53:49 -0400
commitd2322137e47fee29f7338146d5c22806f3479a01 (patch)
treeaf689d89943c138b16ecca83a745cec65b5bad4a
parent22db3b937d9f57f487bb37296bd41c209d69113f (diff)
parent7b6bcb6e7a77b1015dd0ea8dbef2c749123da82f (diff)
downloadpuppet-augeas_core-d2322137e47fee29f7338146d5c22806f3479a01.tar.gz
puppet-augeas_core-d2322137e47fee29f7338146d5c22806f3479a01.tar.bz2
Merge pull request #45 from GabrielNagy/MODULES-11197/update-commits-task
(MODULES-11197) Allow release prep commits in rake task
-rw-r--r--.sync.yml3
-rw-r--r--CHANGELOG.md4
-rw-r--r--Rakefile2
-rw-r--r--rakelib/commits.rake3
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}"