Skip to content

Commit db25478

Browse files
Merge pull request puppetlabs#1177 from puppetlabs/pdksync_releaseprepupdate
pdksync - PDK Update for auto release prep workflow
2 parents 4c634f7 + 7b31ddc commit db25478

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

.github/workflows/auto_release.yml

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

7277
- name: PR outputs

Gemfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ group :development do
2424
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
2525
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2626
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "github_changelog_generator", git: 'https://github.com/carabasdaniel/github-changelog-generator.git', require: false
27+
gem "github_changelog_generator", require: false
2828
end
2929
group :system_tests do
3030
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
@@ -45,16 +45,6 @@ gems['puppet'] = location_for(puppet_version)
4545
gems['facter'] = location_for(facter_version) if facter_version
4646
gems['hiera'] = location_for(hiera_version) if hiera_version
4747

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

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
5454
config.add_pr_wo_labels = true
5555
config.issues = false
5656
config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
57-
config.continue_with_errors = true
5857
config.configure_sections = {
5958
"Changed" => {
6059
"prefix" => "### Changed",

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,5 @@
104104
"description": "Standard Library for Puppet Modules",
105105
"pdk-version": "1.18.1",
106106
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
107-
"template-ref": "heads/main-0-g7be43a3"
107+
"template-ref": "heads/main-0-g12a5dea"
108108
}

0 commit comments

Comments
 (0)