From 4ff5b442e1abc9cb201e8e4a8fbc50d59114d19d Mon Sep 17 00:00:00 2001 From: jbond Date: Fri, 28 Apr 2023 12:49:03 +0200 Subject: (PA-5722) Add frozen string magic comment puppetlabs-augeas_core and puppet-augeasproviders_core both provide the augeas feature. However the both have slightly different files (this lacking the frozen strings magic comment. This causes puppet to perform a change on every puppet run. This PR updates the feature in this repo to add the magic comment so both files match. More then happy to explore alternate fixes --- lib/puppet/feature/augeas.rb | 2 ++ 1 file changed, 2 insertions(+) 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']) -- cgit v1.2.3 From 6205984f35d02698eb07d3061412651bf0912ca4 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 14 Sep 2023 15:46:28 -0700 Subject: (maint) Update commit check This commit updates the commits Rake check to include commit summaries that begin with the Puppet Agent (PA) Jira project and removes references to a non-existent CONTRIBUTION.md. --- rakelib/commits.rake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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-) # 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-)\n" \ + "\t\t(MODULES-)\n" \ "\t\t(docs)\n" \ "\t\t(docs)(DOCUMENT-)\n" \ "\t\t(packaging)\n" -- cgit v1.2.3