Skip to content

Commit 090184d

Browse files
committed
(MODULES-8728) Remove .project from .gitignore
1 parent 760508d commit 090184d

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
--relative

.sync.yml

Lines changed: 4 additions & 0 deletions
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

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

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

metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
}
102102
],
103103
"description": "Standard Library for Puppet Modules",
104-
"pdk-version": "1.9.0",
105-
"template-url": "https://github.com/puppetlabs/pdk-templates/",
106-
"template-ref": "1.9.0-0-g7281db5"
104+
"pdk-version": "1.8.0",
105+
"template-url": "https://github.com/puppetlabs/pdk-templates",
106+
"template-ref": "heads/master-0-gfde5699"
107107
}

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
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)