Skip to content

Commit 11aa348

Browse files
author
David Swan
committed
(maint) - Pdk Update
1 parent 3b21c32 commit 11aa348

File tree

7 files changed

+18
-12
lines changed

7 files changed

+18
-12
lines changed

Diff for: .gitignore

-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,3 @@
2525
.project
2626
.envrc
2727
/inventory.yaml
28-
*.ruby-gemset
29-
*.ruby-version
30-
*.code-workspace
31-
Puppetfile
32-
Vagrantfile

Diff for: .rubocop.yml

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Style/BlockDelimiters:
4040
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
4141
be consistent then.
4242
EnforcedStyle: braces_for_chaining
43+
Style/BracesAroundHashParameters:
44+
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
45+
See https://github.com/rubocop-hq/rubocop/pull/7643
46+
Enabled: true
4347
Style/ClassAndModuleChildren:
4448
Description: Compact style reduces the required amount of indentation.
4549
EnforcedStyle: compact

Diff for: .travis.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
os: linux
23
dist: xenial
34
language: ruby
45
cache: bundler
@@ -7,22 +8,23 @@ before_install:
78
- rm -f Gemfile.lock
89
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
910
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
10-
- '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
11+
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
12+
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
1113
- gem --version
1214
- bundle -v
1315
script:
1416
- 'SIMPLECOV=yes bundle exec rake $CHECK'
1517
bundler_args: --without system_tests
1618
rvm:
17-
- 2.5.3
19+
- 2.5.7
1820
stages:
1921
- static
2022
- spec
2123
- acceptance
2224
-
2325
if: tag =~ ^v\d
2426
name: deploy
25-
matrix:
27+
jobs:
2628
fast_finish: true
2729
include:
2830
-
@@ -34,7 +36,7 @@ matrix:
3436
stage: spec
3537
-
3638
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
37-
rvm: 2.5.3
39+
rvm: 2.5.7
3840
stage: spec
3941
-
4042
env: DEPLOY_TO_FORGE=yes

Diff for: .vscode/extensions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
3-
"jpogran.puppet-vscode",
3+
"puppet.puppet-vscode",
44
"rebornix.Ruby"
55
]
66
}

Diff for: Rakefile

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
24
require 'puppetlabs_spec_helper/rake_tasks'
35
require 'puppet-syntax/tasks/puppet-syntax'

Diff for: metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"version_requirement": ">= 6.0.0 < 7.0.0"
6363
}
6464
],
65-
"pdk-version": "1.15.0",
65+
"pdk-version": "1.17.0",
6666
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
67-
"template-ref": "heads/master-0-gcaed9d7"
67+
"template-ref": "heads/master-0-g095317c"
6868
}

Diff for: spec/spec_helper.rb

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'puppetlabs_spec_helper/module_spec_helper'
24
require 'rspec-puppet-facts'
35

@@ -36,6 +38,7 @@
3638
# set to strictest setting for testing
3739
# by default Puppet runs at warning level
3840
Puppet.settings[:strict] = :warning
41+
Puppet.settings[:strict_variables] = true
3942
end
4043
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4144
c.after(:suite) do

0 commit comments

Comments
 (0)