Skip to content
Snippets Groups Projects
Commit c0e2731a authored by Magnus Svensson's avatar Magnus Svensson
Browse files

PDK update

parent 99633460
No related branches found
No related tags found
No related merge requests found
# EditorConfig is awesome: https://EditorConfig.org
; EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
;top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
; Ruby style as default
; UTF-8 charset
; Unix-style newlines with a newline ending every file
; 2 space indent
; Trim trailing whitespace
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
; Markdown
; 4 space indent
; Trailing whitespace is potentially meaningful, leave it
[*.md]
indent_size = 4
trim_trailing_whitespace = false
# The JSON files contain newlines inconsistently
; Shell scripts & Python
; 4 space indent
[*.{sh,py}]
indent_size = 4
[Makefile]
indent_style = tab
; The JSON files contain newlines inconsistently
[*.json]
indent_size = 2
insert_final_newline = ignore
[*.{ps1,psm1}]
......
......@@ -3,3 +3,11 @@
*.pp eol=lf
*.sh eol=lf
*.epp eol=lf
.editorconfig eol=lf
.gitattributes eol=lf
.gitignore eol=lf
.gitlab-ci.yml eol=lf
.pdkignore eol=lf
.vscode/* eol=lf
Gemfile eol=lf
metadata.json eol=lf
......@@ -25,6 +25,7 @@
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
*~
\#*\#
.\#*
......@@ -25,10 +25,12 @@
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
*~
\#*\#
.\#*
/appveyor.yml
/.editorconfig
/.fixtures.yml
/Gemfile
/.gitattributes
......
......@@ -3,6 +3,7 @@
"puppet.puppet-vscode",
"rebornix.Ruby",
"ms-vscode.powershell",
"EditorConfig.EditorConfig"
"EditorConfig.EditorConfig",
"glenbuktenica.unicode-substitutions"
]
}
......@@ -24,13 +24,13 @@ group :development do
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-lint-absolute_classname-check", '3.0.0', require: false
gem "puppet-lint-absolute_classname-check", '3.0.1', require: false
gem "puppet-lint-absolute_template_path", '1.0.1', require: false
gem "puppet-lint-empty_trailing_lines", '0.0.1', require: false
gem "puppet-lint-file_ensure-check", '0.3.1', require: false
gem "puppet-lint-strict_indent-check", '2.0.7', require: false
gem "puppet-lint-file_ensure-check", '1.0.0', require: false
gem "puppet-lint-strict_indent-check", '2.0.8', require: false
gem "puppet-lint-trailing_comma-check", '0.4.2', require: false
gem "puppet-lint-unquoted_string-check", '2.0.0', require: false
gem "puppet-lint-unquoted_string-check", '2.1.0', require: false
end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
......
......@@ -64,7 +64,7 @@
"version_requirement": ">= 5.5.10 < 6.0.0"
}
],
"pdk-version": "2.1.0",
"pdk-version": "2.2.0",
"template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
"template-ref": "heads/liu-0-g8fb0f81"
"template-ref": "heads/liu-0-gd8925d4"
}
---
ignore: []
......@@ -51,6 +51,18 @@ RSpec.configure do |c|
c.after(:suite) do
RSpec::Puppet::Coverage.report!(0)
end
# Filter backtrace noise
backtrace_exclusion_patterns = [
%r{spec_helper},
%r{gems},
]
if c.respond_to?(:backtrace_exclusion_patterns)
c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
elsif c.respond_to?(:backtrace_clean_patterns)
c.backtrace_clean_patterns = backtrace_exclusion_patterns
end
end
# Ensures that a module is defined
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment