Skip to content

Commit 722e568

Browse files
committed
PDK update
1 parent 3ff86aa commit 722e568

File tree

4 files changed

+4
-86
lines changed

4 files changed

+4
-86
lines changed

Diff for: .sync.yml

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Gemfile:
77
optional:
88
":development":
99
- gem: 'puppet-resource_api'
10-
- gem: github_changelog_generator
11-
version: '= 1.15.2'
1210
.rubocop.yml:
1311
include_todos: true
1412
Rakefile:

Diff for: Gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ group :development do
2323
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
2424
gem "facterdb", '~> 1.18', require: false
2525
gem "metadata-json-lint", '~> 3.0', require: false
26+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
2627
gem "rspec-puppet-facts", '~> 2.0', require: false
2728
gem "codecov", '~> 0.2', require: false
2829
gem "dependency_checker", '~> 1.0.0', require: false
@@ -33,17 +34,17 @@ group :development do
3334
gem "rubocop", '= 1.48.1', require: false
3435
gem "rubocop-performance", '= 1.16.0', require: false
3536
gem "rubocop-rspec", '= 2.19.0', require: false
37+
gem "puppet-strings", '~> 4.0', require: false
3638
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3739
gem "puppet-resource_api", require: false
38-
gem "github_changelog_generator", '= 1.15.2', require: false
3940
end
4041
group :system_tests do
4142
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
4243
gem "serverspec", '~> 2.41', require: false
4344
end
4445
group :release_prep do
4546
gem "puppet-strings", '~> 4.0', require: false
46-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
47+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
4748
end
4849

4950
puppet_version = ENV['PUPPET_GEM_VERSION']

Diff for: Rakefile

-81
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,6 @@ require 'bundler'
44
require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus'
55
require 'puppetlabs_spec_helper/rake_tasks'
66
require 'puppet-syntax/tasks/puppet-syntax'
7-
require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
87
require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
98

10-
def changelog_user
11-
return unless Rake.application.top_level_tasks.include? "changelog"
12-
returnVal = "puppetlabs" || JSON.load(File.read('metadata.json'))['author']
13-
raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
14-
puts "GitHubChangelogGenerator user:#{returnVal}"
15-
returnVal
16-
end
17-
18-
def changelog_project
19-
return unless Rake.application.top_level_tasks.include? "changelog"
20-
21-
returnVal = nil
22-
returnVal ||= begin
23-
metadata_source = JSON.load(File.read('metadata.json'))['source']
24-
metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
25-
26-
metadata_source_match && metadata_source_match[1]
27-
end
28-
29-
raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
30-
31-
puts "GitHubChangelogGenerator project:#{returnVal}"
32-
returnVal
33-
end
34-
35-
def changelog_future_release
36-
return unless Rake.application.top_level_tasks.include? "changelog"
37-
returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
38-
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
39-
puts "GitHubChangelogGenerator future_release:#{returnVal}"
40-
returnVal
41-
end
42-
439
PuppetLint.configuration.send('disable_relative')
44-
45-
46-
if Gem.loaded_specs.key? 'github_changelog_generator'
47-
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
48-
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
49-
config.user = "#{changelog_user}"
50-
config.project = "#{changelog_project}"
51-
config.since_tag = "v3.0.0"
52-
config.max_issues = 500
53-
config.future_release = "#{changelog_future_release}"
54-
config.exclude_labels = ['maintenance']
55-
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
56-
config.add_pr_wo_labels = true
57-
config.issues = false
58-
config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
59-
config.configure_sections = {
60-
"Changed" => {
61-
"prefix" => "### Changed",
62-
"labels" => ["backwards-incompatible"],
63-
},
64-
"Added" => {
65-
"prefix" => "### Added",
66-
"labels" => ["enhancement", "feature"],
67-
},
68-
"Fixed" => {
69-
"prefix" => "### Fixed",
70-
"labels" => ["bug", "documentation", "bugfix"],
71-
},
72-
}
73-
end
74-
else
75-
desc 'Generate a Changelog from GitHub'
76-
task :changelog do
77-
raise <<EOM
78-
The changelog tasks depends on recent features of the github_changelog_generator gem.
79-
Please manually add it to your .sync.yml for now, and run `pdk update`:
80-
---
81-
Gemfile:
82-
optional:
83-
':development':
84-
- gem: 'github_changelog_generator'
85-
version: '~> 1.15'
86-
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
87-
EOM
88-
end
89-
end
90-

Diff for: metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@
8383
}
8484
],
8585
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
86-
"template-ref": "heads/main-0-g01c6a19",
86+
"template-ref": "heads/main-0-g79a2f93",
8787
"pdk-version": "3.0.0"
8888
}

0 commit comments

Comments
 (0)