Skip to content

Commit 881331b

Browse files
committed
(maint) Update PDK templates to SHA a6554ab
This commit updates the module to PDK template version SHA a6554ab
1 parent 3eddf83 commit 881331b

File tree

7 files changed

+15
-27
lines changed

7 files changed

+15
-27
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
26+
.vscode/
27+
.envrc
28+
/inventory.yaml

.pdkignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
26+
.vscode/
27+
.envrc
28+
/inventory.yaml
2529
/appveyor.yml
2630
/.fixtures.yml
2731
/Gemfile
@@ -30,6 +34,7 @@
3034
/.gitlab-ci.yml
3135
/.pdkignore
3236
/Rakefile
37+
/rakelib/
3338
/.rspec
3439
/.rubocop.yml
3540
/.travis.yml

.project

Lines changed: 0 additions & 23 deletions
This file was deleted.

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ end
2222

2323
def changelog_future_release
2424
return unless Rake.application.top_level_tasks.include? "changelog"
25-
returnVal = JSON.load(File.read('metadata.json'))['version']
25+
returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
2626
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
2727
puts "GitHubChangelogGenerator future_release:#{returnVal}"
2828
returnVal

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ test_script:
4646
- gem -v
4747
- bundle -v
4848
- bundle exec rake %CHECK%
49+
- pwsh -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
50+
- powershell -NoProfile -NoLogo -NonInteractive -Command $PSVersionTable
4951
notifications:
5052
- provider: Email
5153
to:

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@
7676
],
7777
"pdk-version": "1.8.0",
7878
"template-url": "https://github.com/puppetlabs/pdk-templates",
79-
"template-ref": "heads/master-0-g7281db5"
80-
}
79+
"template-ref": "heads/master-0-ga6554ab"
80+
}

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
next unless File.exist?(f) && File.readable?(f) && File.size?(f)
2020

2121
begin
22-
default_facts.merge!(YAML.safe_load(File.read(f)))
22+
default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
2323
rescue => e
2424
RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
2525
end

0 commit comments

Comments
 (0)