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

PDK update

parent 1a250c66
No related branches found
No related tags found
No related merge requests found
Pipeline #158812 passed
......@@ -31,9 +31,14 @@ indent_size = 4
[Makefile]
indent_style = tab
; The JSON files contain newlines inconsistently
[*.json]
insert_final_newline = ignore
[*.{ps1,psm1}]
indent_size = 4
# Ignore paths
[{LICENSE,REFERENCE.md}]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
--relative
--no-80chars-check
--no-lookup_in_parameter-check
--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp
{
"recommendations": [
"puppet.puppet-vscode",
"rebornix.Ruby",
"ms-vscode.powershell",
"EditorConfig.EditorConfig",
"glenbuktenica.unicode-substitutions"
"glenbuktenica.unicode-substitutions",
"Shopify.ruby-lsp"
]
}
......@@ -22,9 +22,12 @@ group :development do
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "deep_merge", '~> 1.2.2', require: false
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
gem "facterdb", '~> 2.1', require: false
gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "metadata-json-lint", '~> 4.0', require: false
gem "rspec-puppet-facts", '~> 4.0', require: false
gem "json-schema", '< 5.1.1', require: false
gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "dependency_checker", '~> 1.0.0', require: false
gem "parallel_tests", '= 3.12.1', require: false
gem "pry", '~> 0.10', require: false
......@@ -34,13 +37,13 @@ group :development do
gem "rubocop-performance", '= 1.16.0', require: false
gem "rubocop-rspec", '= 2.19.0', require: false
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "rexml", '>= 3.0.0', '< 3.2.7', require: false
gem "puppet-resource_api", require: false
gem "webmock", require: false
end
group :development, :release_prep do
gem "puppet-strings", '~> 4.0', require: false
gem "puppetlabs_spec_helper", '~> 7.0', require: false
gem "puppetlabs_spec_helper", '~> 8.0', require: false
gem "puppet-blacksmith", '~> 7.0', require: false
end
group :system_tests do
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
......
......@@ -7,3 +7,8 @@ require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
PuppetLint.configuration.send('disable_relative')
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_lookup_in_parameter')
PuppetLint.configuration.fail_on_warnings = false
PuppetLint.configuration.ignore_paths = [".vendor/**/*.pp", ".bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp", "tests/**/*.pp", "types/**/*.pp", "vendor/**/*.pp"]
......@@ -30,7 +30,7 @@
"version_requirement": ">= 7.24 < 9.0.0"
}
],
"pdk-version": "3.3.0",
"pdk-version": "3.4.0",
"template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
"template-ref": "heads/liu-0-g5dd7d7f"
"template-ref": "heads/liu-0-g967906f"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment