PDK Update for release prep workflow
authorDaniel Carabas <daniel.carabas@puppet.com>
Fri, 2 Apr 2021 11:19:34 +0000 (14:19 +0300)
committerDaniel Carabas <daniel.carabas@puppet.com>
Fri, 2 Apr 2021 11:19:34 +0000 (14:19 +0300)
Gemfile
metadata.json

diff --git a/Gemfile b/Gemfile
index ae2b430dc2de3dd812be08c7ecc9f177bca207b7..135373d02bf85359eed8eb285073b1407b617cf6 100644 (file)
--- 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
index 964bfddc41886dc754022eb2c60ad559f091b1de..849540e80790f3f9fe4787d1d9b391a289614914 100644 (file)
@@ -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"
 }