From aa17f1d05542935dd0f71da313e381af5b82bdfb Mon Sep 17 00:00:00 2001 From: Daniel Carabas Date: Fri, 2 Apr 2021 14:19:34 +0300 Subject: [PATCH 1/1] PDK Update for release prep workflow --- Gemfile | 10 ---------- metadata.json | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index ae2b430..135373d 100644 --- a/Gemfile +++ b/Gemfile @@ -45,16 +45,6 @@ gems['puppet'] = location_for(puppet_version) gems['facter'] = location_for(facter_version) if facter_version gems['hiera'] = location_for(hiera_version) if hiera_version -if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} - # If we're using a Puppet gem on Windows which handles its own win32-xxx gem - # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). - gems['win32-dir'] = ['<= 0.4.9', require: false] - gems['win32-eventlog'] = ['<= 0.6.5', require: false] - gems['win32-process'] = ['<= 0.7.5', require: false] - gems['win32-security'] = ['<= 0.2.5', require: false] - gems['win32-service'] = ['0.8.8', require: false] -end - gems.each do |gem_name, gem_params| gem gem_name, *gem_params end diff --git a/metadata.json b/metadata.json index 964bfdd..849540e 100644 --- a/metadata.json +++ b/metadata.json @@ -39,6 +39,6 @@ } ], "template-url": "https://github.com/puppetlabs/pdk-templates.git#main", - "template-ref": "heads/main-0-g7be43a3", + "template-ref": "heads/main-0-g12a5dea", "pdk-version": "1.18.1" } -- 2.45.2