Skip to content

Commit 0b811af

Browse files
authored
Merge pull request puppetlabs#82 from puppetlabs/pdksync_modules-8728
pdksync - Remove .project from .gitignore
2 parents 64e12b3 + 790ba65 commit 0b811af

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.vscode/
26+
.envrc

.pdkignore

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.vscode/
26+
.envrc
2527
/appveyor.yml
2628
/.fixtures.yml
2729
/Gemfile

.puppet-lint.rc

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
--relative

.sync.yml

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
2+
.gitignore:
3+
required:
4+
- ---.project
5+
26
.gitlab-ci.yml:
37
unmanaged: true
48

Rakefile

+1-1
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

metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666
],
6767
"description": "Tasks that manipulate a service",
68-
"pdk-version": "1.9.0",
69-
"template-url": "https://github.com/puppetlabs/pdk-templates/",
70-
"template-ref": "heads/master-0-g615413e"
68+
"pdk-version": "1.8.0",
69+
"template-url": "https://github.com/puppetlabs/pdk-templates",
70+
"template-ref": "heads/master-0-gfde5699"
7171
}

spec/spec_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
next unless File.exist?(f) && File.readable?(f) && File.size?(f)
2424

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

0 commit comments

Comments
 (0)