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

Merge branch 'test' into 'production'

Test

See merge request pm-liuit/liu_pulpcore!107
parents 3522bac7 0aa350fb
No related branches found
No related tags found
No related merge requests found
Pipeline #139761 passed
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
/spec/fixtures/modules/* /spec/fixtures/modules/*
/tmp/ /tmp/
/vendor/ /vendor/
/.vendor/
/convert_report.txt /convert_report.txt
/update_report.txt /update_report.txt
.DS_Store .DS_Store
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
/spec/fixtures/modules/* /spec/fixtures/modules/*
/tmp/ /tmp/
/vendor/ /vendor/
/.vendor/
/convert_report.txt /convert_report.txt
/update_report.txt /update_report.txt
.DS_Store .DS_Store
......
...@@ -20,11 +20,11 @@ group :development do ...@@ -20,11 +20,11 @@ group :development do
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
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 "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.0', require: false gem "deep_merge", '~> 1.2.2', require: false
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
gem "facterdb", '~> 1.26', require: false gem "facterdb", '~> 2.1', require: false
gem "metadata-json-lint", '~> 4.0', require: false gem "metadata-json-lint", '~> 4.0', require: false
gem "rspec-puppet-facts", '~> 3.0', require: false gem "rspec-puppet-facts", '~> 4.0', require: false
gem "dependency_checker", '~> 1.0.0', require: false gem "dependency_checker", '~> 1.0.0', require: false
gem "parallel_tests", '= 3.12.1', require: false gem "parallel_tests", '= 3.12.1', require: false
gem "pry", '~> 0.10', require: false gem "pry", '~> 0.10', require: false
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
"version_requirement": ">= 7.24 < 9.0.0" "version_requirement": ">= 7.24 < 9.0.0"
} }
], ],
"pdk-version": "3.2.0", "pdk-version": "3.3.0",
"template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu", "template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
"template-ref": "heads/liu-0-ge8a6cd8" "template-ref": "heads/liu-0-g5dd7d7f"
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment