(MODULES-8728) Remove .project from .gitignore
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -22,3 +22,5 @@
|
|||||||
/convert_report.txt
|
/convert_report.txt
|
||||||
/update_report.txt
|
/update_report.txt
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.vscode/
|
||||||
|
.envrc
|
||||||
|
|||||||
@@ -22,6 +22,8 @@
|
|||||||
/convert_report.txt
|
/convert_report.txt
|
||||||
/update_report.txt
|
/update_report.txt
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.vscode/
|
||||||
|
.envrc
|
||||||
/appveyor.yml
|
/appveyor.yml
|
||||||
/.fixtures.yml
|
/.fixtures.yml
|
||||||
/Gemfile
|
/Gemfile
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
---
|
---
|
||||||
|
.gitignore:
|
||||||
|
required:
|
||||||
|
- ---.project
|
||||||
|
|
||||||
.gitlab-ci.yml:
|
.gitlab-ci.yml:
|
||||||
unmanaged: true
|
unmanaged: true
|
||||||
|
|
||||||
|
|||||||
2
Rakefile
2
Rakefile
@@ -22,7 +22,7 @@ end
|
|||||||
|
|
||||||
def changelog_future_release
|
def changelog_future_release
|
||||||
return unless Rake.application.top_level_tasks.include? "changelog"
|
return unless Rake.application.top_level_tasks.include? "changelog"
|
||||||
returnVal = JSON.load(File.read('metadata.json'))['version']
|
returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
|
||||||
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
|
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
|
||||||
puts "GitHubChangelogGenerator future_release:#{returnVal}"
|
puts "GitHubChangelogGenerator future_release:#{returnVal}"
|
||||||
returnVal
|
returnVal
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
"version_requirement": ">= 4.7.0 < 7.0.0"
|
"version_requirement": ">= 4.7.0 < 7.0.0"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"template-url": "https://github.com/puppetlabs/pdk-templates/",
|
"template-url": "https://github.com/puppetlabs/pdk-templates",
|
||||||
"template-ref": "1.9.0-0-g7281db5",
|
"template-ref": "heads/master-0-gfde5699",
|
||||||
"pdk-version": "1.7.1"
|
"pdk-version": "1.8.0"
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@ default_fact_files.each do |f|
|
|||||||
next unless File.exist?(f) && File.readable?(f) && File.size?(f)
|
next unless File.exist?(f) && File.readable?(f) && File.size?(f)
|
||||||
|
|
||||||
begin
|
begin
|
||||||
default_facts.merge!(YAML.safe_load(File.read(f)))
|
default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
|
||||||
rescue => e
|
rescue => e
|
||||||
RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
|
RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user