diff options
| author | Tony Vu <tvpartytonight@users.noreply.github.com> | 2023-09-15 10:59:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 10:59:45 -0700 |
| commit | 6cebc082e7b755fa7669774da62f3f5ac503b516 (patch) | |
| tree | d4026283b6e87095c96dbe2f900cfa8cc9e75c81 | |
| parent | c938d3d7070595738c5c1fd17f5446915c815f30 (diff) | |
| parent | 6205984f35d02698eb07d3061412651bf0912ca4 (diff) | |
| download | puppet-augeas_core-6cebc082e7b755fa7669774da62f3f5ac503b516.tar.gz puppet-augeas_core-6cebc082e7b755fa7669774da62f3f5ac503b516.tar.bz2 | |
Merge pull request #61 from mhashizume/PA-5722/main/frozen-string
(PA-5722) Add frozen string magic comment
| -rw-r--r-- | lib/puppet/feature/augeas.rb | 2 | ||||
| -rw-r--r-- | rakelib/commits.rake | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/puppet/feature/augeas.rb b/lib/puppet/feature/augeas.rb index 2e26fbf..681ba68 100644 --- a/lib/puppet/feature/augeas.rb +++ b/lib/puppet/feature/augeas.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'puppet/util/feature' Puppet.features.add(:augeas, libs: ['augeas']) diff --git a/rakelib/commits.rake b/rakelib/commits.rake index 42eb209..7cee9fa 100644 --- a/rakelib/commits.rake +++ b/rakelib/commits.rake @@ -1,4 +1,4 @@ -desc "verify that commit messages match CONTRIBUTING.md requirements" +desc "verify that commit summaries are properly formatted" task(:commits) do # This rake task looks at the summary from every commit from this branch not # in the branch targeted for a PR. @@ -7,11 +7,10 @@ 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 /^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" \ - "\t\t(MODULES-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \ + if /^Release prep|\((maint|packaging|doc|docs|modules|pa-\d+)\)|revert/i.match(commit_summary).nil? + raise "\n\n\n\tPlease make sure that your commit summary (i.e. the first line of the commit message) starts with one of the following:\n" \ + "\t\t(PA-<digits>)\n" \ + "\t\t(MODULES-<digits>)\n" \ "\t\t(docs)\n" \ "\t\t(docs)(DOCUMENT-<digits>)\n" \ "\t\t(packaging)\n" |