From 85f6ef4040b80e854ae5fe69567ed82f807f902d Mon Sep 17 00:00:00 2001 From: Daniel Parks Date: Sun, 2 Mar 2025 11:26:13 -0800 Subject: [PATCH] PDK update. --- .github/workflows/pr-checks.yaml | 2 +- Gemfile | 8 +++++--- metadata.json | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml index 646322e..14c10ea 100644 --- a/.github/workflows/pr-checks.yaml +++ b/.github/workflows/pr-checks.yaml @@ -55,7 +55,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-22.04 puppet: 6 - os: ubuntu-latest puppet: 7 diff --git a/Gemfile b/Gemfile index f84ea87..dc6cbe0 100644 --- a/Gemfile +++ b/Gemfile @@ -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,7 +37,6 @@ 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 end group :development, :release_prep do gem "puppet-strings", '~> 4.0', require: false diff --git a/metadata.json b/metadata.json index c9555c1..e15cbd5 100644 --- a/metadata.json +++ b/metadata.json @@ -83,7 +83,7 @@ "go", "golang" ], - "pdk-version": "3.3.0", + "pdk-version": "3.4.0", "template-url": "https://github.com/danielparks/pdk-templates#main", - "template-ref": "heads/main-0-g918ea5f" + "template-ref": "heads/main-0-gb85631a" }