Skip to content

Commit

Permalink
Merge pull request #426 from puppetlabs/pdksync_PDK_UPDATE
Browse files Browse the repository at this point in the history
pdksync - (maint) - Pdk Update
  • Loading branch information
sanfrancrisko committed May 14, 2020
2 parents 84bc80d + 484f27a commit 07533d1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .rubocop.yml
Expand Up @@ -40,6 +40,10 @@ Style/BlockDelimiters:
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
be consistent then.
EnforcedStyle: braces_for_chaining
Style/BracesAroundHashParameters:
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
See https://github.com/rubocop-hq/rubocop/pull/7643
Enabled: true
Style/ClassAndModuleChildren:
Description: Compact style reduces the required amount of indentation.
EnforcedStyle: compact
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
@@ -1,6 +1,6 @@
{
"recommendations": [
"jpogran.puppet-vscode",
"puppet.puppet-vscode",
"rebornix.Ruby"
]
}
2 changes: 1 addition & 1 deletion metadata.json
Expand Up @@ -81,6 +81,6 @@
}
],
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "1.17.0-0-gd3a4319",
"template-ref": "heads/master-0-g095317c",
"pdk-version": "1.17.0"
}
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Expand Up @@ -42,6 +42,7 @@
# set to strictest setting for testing
# by default Puppet runs at warning level
Puppet.settings[:strict] = :warning
Puppet.settings[:strict_variables] = true
end
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
c.after(:suite) do
Expand Down

0 comments on commit 07533d1

Please sign in to comment.