Skip to content

Commit 2817583

Browse files
author
Daniel Carabas
committed
PDK Update for release prep workflow
1 parent 27618d8 commit 2817583

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

.github/workflows/auto_release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ jobs:
6767
branch: "release-prep"
6868
delete-branch: true
6969
title: "Release prep v${{ steps.gv.outputs.ver }}"
70-
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 }}"
70+
body: |
71+
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 }}.
72+
Please verify before merging:
73+
- [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
74+
- [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
75+
- [ ] 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
7176
labels: "maintenance"
7277

7378
- name: PR outputs

Gemfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,6 @@ gems['puppet'] = location_for(puppet_version)
4646
gems['facter'] = location_for(facter_version) if facter_version
4747
gems['hiera'] = location_for(hiera_version) if hiera_version
4848

49-
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
50-
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
51-
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
52-
gems['win32-dir'] = ['<= 0.4.9', require: false]
53-
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
54-
gems['win32-process'] = ['<= 0.7.5', require: false]
55-
gems['win32-security'] = ['<= 0.2.5', require: false]
56-
gems['win32-service'] = ['0.8.8', require: false]
57-
end
58-
5949
gems.each do |gem_name, gem_params|
6050
gem gem_name, *gem_params
6151
end

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@
9090
],
9191
"description": "This module simply manages /etc/motd or the Windows Logon Message as a template, showing interpolation of system attributes",
9292
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
93-
"template-ref": "heads/main-0-g7be43a3",
93+
"template-ref": "heads/main-0-g12a5dea",
9494
"pdk-version": "1.18.1"
9595
}

0 commit comments

Comments
 (0)