From febc03df98e7f738bf1f48cbe3ac65267bbfd7ba Mon Sep 17 00:00:00 2001
From: Daniel Carabas <daniel.carabas@puppet.com>
Date: Fri, 2 Apr 2021 14:19:35 +0300
Subject: [PATCH 1/2] 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 ae2b430d..135373d0 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 bf2f7d30..59ec7040 100644
--- a/metadata.json
+++ b/metadata.json
@@ -104,6 +104,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"
 }

From 6f46f8cbaa4df5805ad26e9a1b30d864c48223bb Mon Sep 17 00:00:00 2001
From: daiana <daiana.mezdrea@yahoo.com>
Date: Mon, 5 Apr 2021 11:06:57 +0300
Subject: [PATCH 2/2] Add auto-relase in .sync.yml

---
 .github/workflows/auto_release.yml | 13 +++++++++----
 .sync.yml                          |  2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index a88b99ca..d15d148d 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -36,7 +36,7 @@ jobs:
         persist-credentials: false
 
     - name: "PDK Release prep"
-      uses: docker://puppet/pdk:nightly
+      uses: docker://puppet/iac_release:ci
       with:
         args: 'release prep --force'
       env:
@@ -46,12 +46,12 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
       id: gv
       run: |
-        echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")"
+        echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
 
     - name: "Commit changes"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        git config --local user.email "action@github.com"
+        git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
         git config --local user.name "GitHub Action"
         git add .
         git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
@@ -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)"
+        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/.sync.yml b/.sync.yml
index a8418891..5788acab 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -24,5 +24,7 @@ spec/spec_helper.rb:
   unmanaged: false
 .github/workflows/release.yml:
   unmanaged: false
+.github/workflows/auto_release.yml:
+  unmanaged: false
 .travis.yml:
   delete: true