From 7b31ddc3d0e4f98e4b465fcb21599c34e50a73e4 Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Fri, 2 Apr 2021 14:19:40 +0300
Subject: [PATCH] PDK Update for release prep workflow

---
 .github/workflows/auto_release.yml |  7 ++++++-
 Gemfile                            | 12 +-----------
 Rakefile                           |  1 -
 metadata.json                      |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index affeca907..d15d148d9 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -66,7 +66,12 @@ jobs:
         branch: "release-prep"
         delete-branch: true
         title: "Release prep v${{ steps.gv.outputs.ver }}"
-        body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}"
+        body: |
+          Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}. 
+          Please verify before merging:
+          - [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
+          - [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
+          - [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
         labels: "maintenance"
 
     - name: PR outputs
diff --git a/Gemfile b/Gemfile
index beb483a4f..135373d02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator",                              git: 'https://github.com/carabasdaniel/github-changelog-generator.git', require: false
+  gem "github_changelog_generator",                              require: false
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
@@ -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/Rakefile b/Rakefile
index 1b828da21..2906c15ba 100644
--- a/Rakefile
+++ b/Rakefile
@@ -54,7 +54,6 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.add_pr_wo_labels = true
     config.issues = false
     config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
-    config.continue_with_errors = true
     config.configure_sections = {
       "Changed" => {
         "prefix" => "### Changed",
diff --git a/metadata.json b/metadata.json
index ade6b7af6..51da667ac 100644
--- a/metadata.json
+++ b/metadata.json
@@ -104,5 +104,5 @@
   "description": "Standard Library for Puppet Modules",
   "pdk-version": "1.18.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g7be43a3"
+  "template-ref": "heads/main-0-g12a5dea"
 }